patch-2.1.103 linux/drivers/isdn/hisax/isac.c
Next file: linux/drivers/isdn/hisax/isdnl2.c
Previous file: linux/drivers/isdn/hisax/hscx_irq.c
Back to the patch index
Back to the overall index
- Lines: 51
- Date:
Thu May 14 18:43:27 1998
- Orig file:
v2.1.102/linux/drivers/isdn/hisax/isac.c
- Orig date:
Wed Apr 1 20:11:50 1998
diff -u --recursive --new-file v2.1.102/linux/drivers/isdn/hisax/isac.c linux/drivers/isdn/hisax/isac.c
@@ -305,7 +305,7 @@
del_timer(&cs->dbusytimer);
if (test_and_clear_bit(FLG_L1_DBUSY, &cs->HW_Flags))
isac_sched_event(cs, D_CLEARBUSY);
- if (cs->tx_skb)
+ if (cs->tx_skb) {
if (cs->tx_skb->len) {
isac_fill_fifo(cs);
goto afterXPR;
@@ -314,6 +314,7 @@
cs->tx_cnt = 0;
cs->tx_skb = NULL;
}
+ }
if ((cs->tx_skb = skb_dequeue(&cs->sq))) {
cs->tx_cnt = 0;
isac_fill_fifo(cs);
@@ -348,7 +349,7 @@
}
#if ARCOFI_USE
if (v1 & 0x08) {
- if (!cs->mon_rx)
+ if (!cs->mon_rx) {
if (!(cs->mon_rx = kmalloc(MAX_MON_FRAME, GFP_ATOMIC))) {
if (cs->debug & L1_DEB_WARN)
debugl1(cs, "ISAC MON RX out of memory!");
@@ -358,6 +359,7 @@
goto afterMONR0;
} else
cs->mon_rxp = 0;
+ }
if (cs->mon_rxp >= MAX_MON_FRAME) {
cs->mocr &= 0xf0;
cs->mocr |= 0x0a;
@@ -379,7 +381,7 @@
}
afterMONR0:
if (v1 & 0x80) {
- if (!cs->mon_rx)
+ if (!cs->mon_rx) {
if (!(cs->mon_rx = kmalloc(MAX_MON_FRAME, GFP_ATOMIC))) {
if (cs->debug & L1_DEB_WARN)
debugl1(cs, "ISAC MON RX out of memory!");
@@ -389,6 +391,7 @@
goto afterMONR1;
} else
cs->mon_rxp = 0;
+ }
if (cs->mon_rxp >= MAX_MON_FRAME) {
cs->mocr &= 0x0f;
cs->mocr |= 0xa0;
FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen, slshen@lbl.gov