diff options
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/isdn.h | 20 | ||||
| -rw-r--r-- | include/linux/isdnif.h | 3 |
2 files changed, 10 insertions, 13 deletions
diff --git a/include/linux/isdn.h b/include/linux/isdn.h index 213d2cbc24f4..ee65c234e121 100644 --- a/include/linux/isdn.h +++ b/include/linux/isdn.h @@ -245,12 +245,10 @@ typedef struct { #define ISDN_TIMER_MODEMPLUS 2 #define ISDN_TIMER_MODEMRING 4 #define ISDN_TIMER_MODEMXMIT 8 -#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_CARRIER) +#define ISDN_TIMER_SLOW (ISDN_TIMER_MODEMRING | ISDN_TIMER_CARRIER) /* GLOBAL_FLAGS */ #define ISDN_GLOBAL_STOPPED 1 @@ -267,10 +265,10 @@ typedef struct { #define ISDN_NET_MAGIC 0x49344C02 /* for paranoia-checking */ /* Phone-list-element */ -typedef struct { - void *next; - char num[ISDN_MSNLEN]; -} isdn_net_phone; +struct isdn_net_phone { + struct list_head list; + char num[ISDN_MSNLEN]; +}; /* Principles when extending structures for generic encapsulation protocol @@ -283,11 +281,13 @@ typedef struct { /* Local interface-data */ typedef struct isdn_net_local_s { + spinlock_t lock; ulong magic; char name[10]; /* Name of device */ - struct timer_list dial_timer; /* dial timeout */ + struct timer_list dial_timer; /* dial events timer */ int dial_event; /* event in case of timer expiry */ struct net_device_stats stats; /* Ethernet Statistics */ + struct timer_list hup_timer; /* auto hangup timer */ int isdn_slot; /* Index to isdn device/channel */ int ppp_slot; /* PPPD device slot number */ int pre_device; /* Preselected isdn-device */ @@ -335,10 +335,10 @@ typedef struct isdn_net_local_s { ulong sqfull_stamp; /* Start-Time of overload */ ulong slavedelay; /* Dynamic bundling delaytime */ int triggercps; /* BogoCPS needed for trigger slave */ - isdn_net_phone *phone[2]; /* List of remote-phonenumbers */ + struct list_head phone[2]; /* List of remote-phonenumbers */ /* phone[0] = Incoming Numbers */ /* phone[1] = Outgoing Numbers */ - isdn_net_phone *dial; /* Pointer to dialed number */ + int dial; /* # of phone number just dialed */ struct net_device *master; /* Ptr to Master device for slaves */ struct net_device *slave; /* Ptr to Slave device for masters */ struct isdn_net_local_s *next; /* Ptr to next link in bundle */ diff --git a/include/linux/isdnif.h b/include/linux/isdnif.h index cb025c8e4759..c9718d4de584 100644 --- a/include/linux/isdnif.h +++ b/include/linux/isdnif.h @@ -275,7 +275,6 @@ typedef struct setup_parm { } setup_parm; -#ifdef CONFIG_ISDN_TTY_FAX /* T.30 Fax G3 */ #define FAXIDLEN 21 @@ -350,8 +349,6 @@ typedef struct T30_s { #define ISDN_FAX_PHASE_D 4 #define ISDN_FAX_PHASE_E 5 -#endif /* TTY_FAX */ - #define ISDN_FAX_CLASS1_FAE 0 #define ISDN_FAX_CLASS1_FTS 1 #define ISDN_FAX_CLASS1_FRS 2 |