diff options
| author | Kai Germaschewski <kai@tp1.ruhr-uni-bochum.de> | 2002-08-03 02:38:53 -0500 |
|---|---|---|
| committer | Kai Germaschewski <kai@tp1.ruhr-uni-bochum.de> | 2002-08-03 02:38:53 -0500 |
| commit | 62720197d48df08f5c24f6a1dc231432a0458d62 (patch) | |
| tree | f0ea40fa2df33b090f81cde15e9203184755520b /include/linux | |
| parent | a30588dccd8d5fba05f87c99e4d74c731247bcc2 (diff) | |
ISDN: More state machine cleanup and normal timer use
Even more states can go away, and there's not really any need to have
the ISDN code have manage timers by itself, just use normal kernel
timers for the state machine now.
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/isdn.h | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/include/linux/isdn.h b/include/linux/isdn.h index d7a911bed2ee..9544c782d17d 100644 --- a/include/linux/isdn.h +++ b/include/linux/isdn.h @@ -245,18 +245,12 @@ typedef struct { #define ISDN_TIMER_MODEMPLUS 2 #define ISDN_TIMER_MODEMRING 4 #define ISDN_TIMER_MODEMXMIT 8 -#define ISDN_TIMER_NETDIAL 16 #define ISDN_TIMER_NETHANGUP 32 #define ISDN_TIMER_CARRIER 256 /* Wait for Carrier */ #define ISDN_TIMER_FAST (ISDN_TIMER_MODEMREAD | ISDN_TIMER_MODEMPLUS | \ ISDN_TIMER_MODEMXMIT) #define ISDN_TIMER_SLOW (ISDN_TIMER_MODEMRING | ISDN_TIMER_NETHANGUP | \ - ISDN_TIMER_NETDIAL | ISDN_TIMER_CARRIER) - -/* Timeout-Values for isdn_net_dial() */ -#define ISDN_TIMER_DTIMEOUT10 (10*HZ/(ISDN_TIMER_02SEC*(ISDN_TIMER_RES+1))) -#define ISDN_TIMER_DTIMEOUT15 (15*HZ/(ISDN_TIMER_02SEC*(ISDN_TIMER_RES+1))) -#define ISDN_TIMER_DTIMEOUT60 (60*HZ/(ISDN_TIMER_02SEC*(ISDN_TIMER_RES+1))) + ISDN_TIMER_CARRIER) /* GLOBAL_FLAGS */ #define ISDN_GLOBAL_STOPPED 1 @@ -291,6 +285,8 @@ typedef struct { typedef struct isdn_net_local_s { ulong magic; char name[10]; /* Name of device */ + struct timer_list dial_timer; /* dial timeout */ + int dial_event; /* event in case of timer expiry */ struct net_device_stats stats; /* Ethernet Statistics */ int isdn_slot; /* Index to isdn device/channel */ int ppp_slot; /* PPPD device slot number */ @@ -301,7 +297,6 @@ typedef struct isdn_net_local_s { int dialretry; /* Counter for Dialout-retries */ int dialmax; /* Max. Number of Dial-retries */ int cbdelay; /* Delay before Callback starts */ - int dtimer; /* Timeout-counter for dialing */ char msn[ISDN_MSNLEN]; /* MSNs/EAZs for this interface */ u_char cbhup; /* Flag: Reject Call before Callback*/ u_char dialstate; /* State for dialing */ |