diff options
| author | Kai Germaschewski <kai@tp1.ruhr-uni-bochum.de> | 2002-09-29 11:19:12 -0500 |
|---|---|---|
| committer | Kai Germaschewski <kai@tp1.ruhr-uni-bochum.de> | 2002-09-29 11:19:12 -0500 |
| commit | 890ca7d1e2198c417abdc25760d755ca3f5a69a5 (patch) | |
| tree | fcc7e664b3d0c72cc08d761c3598bddc0de8100b /include/linux | |
| parent | ec0100d285920f8331321602672a3e8598b92f71 (diff) | |
ISDN: Move ppp-specifics to isdn_net_dev
Again, ipppd has one kernel connection per channel in a MPPP
setting, so we should keep track in isdn_net_dev.
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/isdn.h | 4 | ||||
| -rw-r--r-- | include/linux/isdn_ppp.h | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/include/linux/isdn.h b/include/linux/isdn.h index 0f817e247efd..cf614ac18adf 100644 --- a/include/linux/isdn.h +++ b/include/linux/isdn.h @@ -312,7 +312,6 @@ typedef struct isdn_net_local_s { ulong magic; spinlock_t lock; struct net_device_stats stats; /* Ethernet Statistics */ - int ppp_slot; /* PPPD device slot number */ int flags; /* Connection-flags */ int dialretry; /* Counter for Dialout-retries */ int dialmax; /* Max. Number of Dial-retries */ @@ -372,7 +371,6 @@ typedef struct isdn_net_local_s { /* a particular channel (including */ /* the frame_cnt */ - int pppbind; /* ippp device for bindings */ int dialtimeout; /* How long shall we try on dialing? (jiffies) */ int dialwait; /* How long shall we wait after failed attempt? (jiffies) */ ulong dialstarted; /* jiffies of first dialing-attempt */ @@ -408,6 +406,8 @@ typedef struct isdn_net_dev_s { int dialstate; /* State for dialing */ struct timer_list hup_timer; /* auto hangup timer */ + int pppbind; /* ippp device for bindings */ + int ppp_slot; /* PPPD device slot number */ isdn_net_local *queue; /* circular list of all bundled channels, which are currently diff --git a/include/linux/isdn_ppp.h b/include/linux/isdn_ppp.h index f2bd82ba2755..dcd0ad4aa68b 100644 --- a/include/linux/isdn_ppp.h +++ b/include/linux/isdn_ppp.h @@ -212,7 +212,7 @@ struct ippp_struct { unsigned int mpmru; unsigned int mpmtu; unsigned int maxcid; - struct isdn_net_local_s *lp; + struct isdn_net_dev_s *idev; int unit; int minor; unsigned int last_link_seqno; |