patch-2.3.46 linux/drivers/isdn/hisax/isdnl1.c
Next file: linux/drivers/isdn/hisax/isurf.c
Previous file: linux/drivers/isdn/hisax/isar.h
Back to the patch index
Back to the overall index
- Lines: 87
- Date:
Tue Feb 15 11:40:43 2000
- Orig file:
v2.3.45/linux/drivers/isdn/hisax/isdnl1.c
- Orig date:
Thu Nov 11 20:11:38 1999
diff -u --recursive --new-file v2.3.45/linux/drivers/isdn/hisax/isdnl1.c linux/drivers/isdn/hisax/isdnl1.c
@@ -1,4 +1,4 @@
-/* $Id: isdnl1.c,v 2.36 1999/08/25 16:50:57 keil Exp $
+/* $Id: isdnl1.c,v 2.37 2000/01/20 19:51:46 keil Exp $
* isdnl1.c common low level stuff for Siemens Chipsetbased isdn cards
* based on the teles driver from Jan den Ouden
@@ -15,6 +15,10 @@
*
*
* $Log: isdnl1.c,v $
+ * Revision 2.37 2000/01/20 19:51:46 keil
+ * Fix AddTimer message
+ * Change CONFIG defines
+ *
* Revision 2.36 1999/08/25 16:50:57 keil
* Fix bugs which cause 2.3.14 hangs (waitqueue init)
*
@@ -138,7 +142,7 @@
*
*/
-const char *l1_revision = "$Revision: 2.36 $";
+const char *l1_revision = "$Revision: 2.37 $";
#define __NO_VERSION__
#include "hisax.h"
@@ -362,7 +366,8 @@
stptr = stptr->next;
if (!found)
dev_kfree_skb(skb);
- }
+ } else
+ dev_kfree_skb(skb);
}
}
@@ -559,11 +564,8 @@
struct PStack *st = fi->userdata;
FsmChangeState(fi, ST_L1_F3);
-// if (!test_bit(FLG_L1_T3RUN, &st->l1.Flags)) {
- FsmDelTimer(&st->l1.timer, 1);
- FsmAddTimer(&st->l1.timer, 550, EV_TIMER_DEACT, NULL, 2);
- test_and_set_bit(FLG_L1_DEACTTIMER, &st->l1.Flags);
-// }
+ FsmRestartTimer(&st->l1.timer, 550, EV_TIMER_DEACT, NULL, 2);
+ test_and_set_bit(FLG_L1_DEACTTIMER, &st->l1.Flags);
}
static void
@@ -574,8 +576,7 @@
if (test_bit(FLG_L1_ACTIVATING, &st->l1.Flags)) {
FsmChangeState(fi, ST_L1_F4);
st->l1.l1hw(st, HW_INFO3 | REQUEST, NULL);
- FsmDelTimer(&st->l1.timer, 1);
- FsmAddTimer(&st->l1.timer, TIMER3_VALUE, EV_TIMER3, NULL, 2);
+ FsmRestartTimer(&st->l1.timer, TIMER3_VALUE, EV_TIMER3, NULL, 2);
test_and_set_bit(FLG_L1_T3RUN, &st->l1.Flags);
} else
FsmChangeState(fi, ST_L1_F3);
@@ -614,7 +615,7 @@
if (!test_bit(FLG_L1_ACTIVATED, &st->l1.Flags)) {
if (test_and_clear_bit(FLG_L1_T3RUN, &st->l1.Flags))
FsmDelTimer(&st->l1.timer, 3);
- FsmAddTimer(&st->l1.timer, 110, EV_TIMER_ACT, NULL, 2);
+ FsmRestartTimer(&st->l1.timer, 110, EV_TIMER_ACT, NULL, 2);
test_and_set_bit(FLG_L1_ACTTIMER, &st->l1.Flags);
}
}
@@ -729,7 +730,7 @@
struct PStack *st = fi->userdata;
FsmChangeState(fi, ST_L1_WAIT_ACT);
- FsmAddTimer(&st->l1.timer, st->l1.delay, EV_TIMER_ACT, NULL, 2);
+ FsmRestartTimer(&st->l1.timer, st->l1.delay, EV_TIMER_ACT, NULL, 2);
}
static void
@@ -738,7 +739,7 @@
struct PStack *st = fi->userdata;
FsmChangeState(fi, ST_L1_WAIT_DEACT);
- FsmAddTimer(&st->l1.timer, 10, EV_TIMER_DEACT, NULL, 2);
+ FsmRestartTimer(&st->l1.timer, 10, EV_TIMER_DEACT, NULL, 2);
}
static void
FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)