aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
Diffstat (limited to 'drivers')
-rw-r--r--drivers/isdn/hisax/hisax_fcpcipnp.c7
-rw-r--r--drivers/isdn/hisax/hisax_isac.c9
-rw-r--r--drivers/isdn/hisax/st5481_b.c4
-rw-r--r--drivers/isdn/hisax/st5481_d.c4
-rw-r--r--drivers/isdn/i4l/isdn_ppp.c6
5 files changed, 9 insertions, 21 deletions
diff --git a/drivers/isdn/hisax/hisax_fcpcipnp.c b/drivers/isdn/hisax/hisax_fcpcipnp.c
index dc7ef957e897..dbcca287ee2c 100644
--- a/drivers/isdn/hisax/hisax_fcpcipnp.c
+++ b/drivers/isdn/hisax/hisax_fcpcipnp.c
@@ -387,8 +387,7 @@ static void hdlc_fill_fifo(struct fritz_bcs *bcs)
387 387
388 DBG(0x40, "hdlc_fill_fifo"); 388 DBG(0x40, "hdlc_fill_fifo");
389 389
390 if (skb->len == 0) 390 BUG_ON(skb->len == 0);
391 BUG();
392 391
393 bcs->ctrl.sr.cmd &= ~HDLC_CMD_XME; 392 bcs->ctrl.sr.cmd &= ~HDLC_CMD_XME;
394 if (bcs->tx_skb->len > bcs->fifo_size) { 393 if (bcs->tx_skb->len > bcs->fifo_size) {
@@ -630,9 +629,7 @@ static void fritz_b_l2l1(struct hisax_if *ifc, int pr, void *arg)
630 629
631 switch (pr) { 630 switch (pr) {
632 case PH_DATA | REQUEST: 631 case PH_DATA | REQUEST:
633 if (bcs->tx_skb) 632 BUG_ON(bcs->tx_skb);
634 BUG();
635
636 bcs->tx_skb = skb; 633 bcs->tx_skb = skb;
637 DBG_SKB(1, skb); 634 DBG_SKB(1, skb);
638 hdlc_fill_fifo(bcs); 635 hdlc_fill_fifo(bcs);
diff --git a/drivers/isdn/hisax/hisax_isac.c b/drivers/isdn/hisax/hisax_isac.c
index f4972f6c1f5d..81eac344bb03 100644
--- a/drivers/isdn/hisax/hisax_isac.c
+++ b/drivers/isdn/hisax/hisax_isac.c
@@ -476,12 +476,10 @@ static void isac_fill_fifo(struct isac *isac)
476 unsigned char cmd; 476 unsigned char cmd;
477 u_char *ptr; 477 u_char *ptr;
478 478
479 if (!isac->tx_skb) 479 BUG_ON(!isac->tx_skb);
480 BUG();
481 480
482 count = isac->tx_skb->len; 481 count = isac->tx_skb->len;
483 if (count <= 0) 482 BUG_ON(count <= 0);
484 BUG();
485 483
486 DBG(DBG_IRQ, "count %d", count); 484 DBG(DBG_IRQ, "count %d", count);
487 485
@@ -859,8 +857,7 @@ void isac_d_l2l1(struct hisax_if *hisax_d_if, int pr, void *arg)
859 dev_kfree_skb(skb); 857 dev_kfree_skb(skb);
860 break; 858 break;
861 } 859 }
862 if (isac->tx_skb) 860 BUG_ON(isac->tx_skb);
863 BUG();
864 861
865 isac->tx_skb = skb; 862 isac->tx_skb = skb;
866 isac_fill_fifo(isac); 863 isac_fill_fifo(isac);
diff --git a/drivers/isdn/hisax/st5481_b.c b/drivers/isdn/hisax/st5481_b.c
index 657817a591fe..22fd5db18d48 100644
--- a/drivers/isdn/hisax/st5481_b.c
+++ b/drivers/isdn/hisax/st5481_b.c
@@ -356,9 +356,7 @@ void st5481_b_l2l1(struct hisax_if *ifc, int pr, void *arg)
356 356
357 switch (pr) { 357 switch (pr) {
358 case PH_DATA | REQUEST: 358 case PH_DATA | REQUEST:
359 if (bcs->b_out.tx_skb) 359 BUG_ON(bcs->b_out.tx_skb);
360 BUG();
361
362 bcs->b_out.tx_skb = skb; 360 bcs->b_out.tx_skb = skb;
363 break; 361 break;
364 case PH_ACTIVATE | REQUEST: 362 case PH_ACTIVATE | REQUEST:
diff --git a/drivers/isdn/hisax/st5481_d.c b/drivers/isdn/hisax/st5481_d.c
index 941f7022ada1..493dc94992e5 100644
--- a/drivers/isdn/hisax/st5481_d.c
+++ b/drivers/isdn/hisax/st5481_d.c
@@ -596,9 +596,7 @@ void st5481_d_l2l1(struct hisax_if *hisax_d_if, int pr, void *arg)
596 break; 596 break;
597 case PH_DATA | REQUEST: 597 case PH_DATA | REQUEST:
598 DBG(2, "PH_DATA REQUEST len %d", skb->len); 598 DBG(2, "PH_DATA REQUEST len %d", skb->len);
599 if (adapter->d_out.tx_skb) 599 BUG_ON(adapter->d_out.tx_skb);
600 BUG();
601
602 adapter->d_out.tx_skb = skb; 600 adapter->d_out.tx_skb = skb;
603 FsmEvent(&adapter->d_out.fsm, EV_DOUT_START_XMIT, NULL); 601 FsmEvent(&adapter->d_out.fsm, EV_DOUT_START_XMIT, NULL);
604 break; 602 break;
diff --git a/drivers/isdn/i4l/isdn_ppp.c b/drivers/isdn/i4l/isdn_ppp.c
index b9fed8a3bcc6..a0927d1b7a0c 100644
--- a/drivers/isdn/i4l/isdn_ppp.c
+++ b/drivers/isdn/i4l/isdn_ppp.c
@@ -974,8 +974,7 @@ void isdn_ppp_receive(isdn_net_dev * net_dev, isdn_net_local * lp, struct sk_buf
974 int slot; 974 int slot;
975 int proto; 975 int proto;
976 976
977 if (net_dev->local->master) 977 BUG_ON(net_dev->local->master); // we're called with the master device always
978 BUG(); // we're called with the master device always
979 978
980 slot = lp->ppp_slot; 979 slot = lp->ppp_slot;
981 if (slot < 0 || slot >= ISDN_MAX_CHANNELS) { 980 if (slot < 0 || slot >= ISDN_MAX_CHANNELS) {
@@ -2527,8 +2526,7 @@ static struct sk_buff *isdn_ppp_decompress(struct sk_buff *skb,struct ippp_struc
2527 printk(KERN_DEBUG "ippp: no decompressor defined!\n"); 2526 printk(KERN_DEBUG "ippp: no decompressor defined!\n");
2528 return skb; 2527 return skb;
2529 } 2528 }
2530 if (!stat) // if we have a compressor, stat has been set as well 2529 BUG_ON(!stat); // if we have a compressor, stat has been set as well
2531 BUG();
2532 2530
2533 if((master && *proto == PPP_COMP) || (!master && *proto == PPP_COMPFRAG) ) { 2531 if((master && *proto == PPP_COMP) || (!master && *proto == PPP_COMPFRAG) ) {
2534 // compressed packets are compressed by their protocol type 2532 // compressed packets are compressed by their protocol type