aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/isdn/i4l
diff options
context:
space:
mode:
authorEric Sesterhenn <snakebyte@gmx.de>2006-03-26 11:19:26 -0500
committerAdrian Bunk <bunk@stusta.de>2006-03-26 11:19:26 -0500
commit6dd44a74469c203c5106ada2082c46267b4ac674 (patch)
treedfc0b29c97b3147cecfcc874c1ae952b25841c71 /drivers/isdn/i4l
parent56ee48277fa214b3b7b0fd91e7fd3464e12597de (diff)
BUG_ON() Conversion in drivers/isdn
this changes if() BUG(); constructs to BUG_ON() which is cleaner, contains unlikely() and can better optimized away. Signed-off-by: Eric Sesterhenn <snakebyte@gmx.de> Signed-off-by: Adrian Bunk <bunk@stusta.de>
Diffstat (limited to 'drivers/isdn/i4l')
-rw-r--r--drivers/isdn/i4l/isdn_ppp.c6
1 files changed, 2 insertions, 4 deletions
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