summaryrefslogtreecommitdiff
path: root/include/linux
diff options
context:
space:
mode:
authorKai Germaschewski <kai@tp1.ruhr-uni-bochum.de>2002-09-22 10:47:54 -0500
committerKai Germaschewski <kai@tp1.ruhr-uni-bochum.de>2002-09-22 10:47:54 -0500
commit967ee5aecd9e8e113d221061ac2a8e962f98d1f4 (patch)
tree3a3a3d0106d8acf3f06a12ce713758b8e0571aa1 /include/linux
parentcc8f2609f42024dac36ef1986d45924397295f46 (diff)
parentcf2e99d6d68576856b36c29f48b05428ea0d7963 (diff)
Merge tp1.ruhr-uni-bochum.de:/home/kai/kernel/v2.5/linux-2.5.isdn
into tp1.ruhr-uni-bochum.de:/home/kai/kernel/v2.5/linux-2.5.make
Diffstat (limited to 'include/linux')
-rw-r--r--include/linux/isdn.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/include/linux/isdn.h b/include/linux/isdn.h
index 213d2cbc24f4..174dee960a20 100644
--- a/include/linux/isdn.h
+++ b/include/linux/isdn.h
@@ -285,9 +285,10 @@ typedef struct {
typedef struct isdn_net_local_s {
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 */