diff options
Diffstat (limited to 'drivers/isdn/mISDN/hwchannel.c')
-rw-r--r-- | drivers/isdn/mISDN/hwchannel.c | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/drivers/isdn/mISDN/hwchannel.c b/drivers/isdn/mISDN/hwchannel.c index f6e108d0125f..c74c363554c4 100644 --- a/drivers/isdn/mISDN/hwchannel.c +++ b/drivers/isdn/mISDN/hwchannel.c | |||
@@ -206,7 +206,7 @@ recv_Bchannel(struct bchannel *bch, unsigned int id) | |||
206 | hh->id = id; | 206 | hh->id = id; |
207 | if (bch->rcount >= 64) { | 207 | if (bch->rcount >= 64) { |
208 | printk(KERN_WARNING "B-channel %p receive queue overflow, " | 208 | printk(KERN_WARNING "B-channel %p receive queue overflow, " |
209 | "flushing!\n", bch); | 209 | "flushing!\n", bch); |
210 | skb_queue_purge(&bch->rqueue); | 210 | skb_queue_purge(&bch->rqueue); |
211 | bch->rcount = 0; | 211 | bch->rcount = 0; |
212 | return; | 212 | return; |
@@ -231,7 +231,7 @@ recv_Bchannel_skb(struct bchannel *bch, struct sk_buff *skb) | |||
231 | { | 231 | { |
232 | if (bch->rcount >= 64) { | 232 | if (bch->rcount >= 64) { |
233 | printk(KERN_WARNING "B-channel %p receive queue overflow, " | 233 | printk(KERN_WARNING "B-channel %p receive queue overflow, " |
234 | "flushing!\n", bch); | 234 | "flushing!\n", bch); |
235 | skb_queue_purge(&bch->rqueue); | 235 | skb_queue_purge(&bch->rqueue); |
236 | bch->rcount = 0; | 236 | bch->rcount = 0; |
237 | } | 237 | } |
@@ -247,10 +247,10 @@ confirm_Dsend(struct dchannel *dch) | |||
247 | struct sk_buff *skb; | 247 | struct sk_buff *skb; |
248 | 248 | ||
249 | skb = _alloc_mISDN_skb(PH_DATA_CNF, mISDN_HEAD_ID(dch->tx_skb), | 249 | skb = _alloc_mISDN_skb(PH_DATA_CNF, mISDN_HEAD_ID(dch->tx_skb), |
250 | 0, NULL, GFP_ATOMIC); | 250 | 0, NULL, GFP_ATOMIC); |
251 | if (!skb) { | 251 | if (!skb) { |
252 | printk(KERN_ERR "%s: no skb id %x\n", __func__, | 252 | printk(KERN_ERR "%s: no skb id %x\n", __func__, |
253 | mISDN_HEAD_ID(dch->tx_skb)); | 253 | mISDN_HEAD_ID(dch->tx_skb)); |
254 | return; | 254 | return; |
255 | } | 255 | } |
256 | skb_queue_tail(&dch->rqueue, skb); | 256 | skb_queue_tail(&dch->rqueue, skb); |
@@ -279,15 +279,15 @@ confirm_Bsend(struct bchannel *bch) | |||
279 | 279 | ||
280 | if (bch->rcount >= 64) { | 280 | if (bch->rcount >= 64) { |
281 | printk(KERN_WARNING "B-channel %p receive queue overflow, " | 281 | printk(KERN_WARNING "B-channel %p receive queue overflow, " |
282 | "flushing!\n", bch); | 282 | "flushing!\n", bch); |
283 | skb_queue_purge(&bch->rqueue); | 283 | skb_queue_purge(&bch->rqueue); |
284 | bch->rcount = 0; | 284 | bch->rcount = 0; |
285 | } | 285 | } |
286 | skb = _alloc_mISDN_skb(PH_DATA_CNF, mISDN_HEAD_ID(bch->tx_skb), | 286 | skb = _alloc_mISDN_skb(PH_DATA_CNF, mISDN_HEAD_ID(bch->tx_skb), |
287 | 0, NULL, GFP_ATOMIC); | 287 | 0, NULL, GFP_ATOMIC); |
288 | if (!skb) { | 288 | if (!skb) { |
289 | printk(KERN_ERR "%s: no skb id %x\n", __func__, | 289 | printk(KERN_ERR "%s: no skb id %x\n", __func__, |
290 | mISDN_HEAD_ID(bch->tx_skb)); | 290 | mISDN_HEAD_ID(bch->tx_skb)); |
291 | return; | 291 | return; |
292 | } | 292 | } |
293 | bch->rcount++; | 293 | bch->rcount++; |
@@ -349,7 +349,7 @@ dchannel_senddata(struct dchannel *ch, struct sk_buff *skb) | |||
349 | } | 349 | } |
350 | if (skb->len > ch->maxlen) { | 350 | if (skb->len > ch->maxlen) { |
351 | printk(KERN_WARNING "%s: skb too large(%d/%d)\n", | 351 | printk(KERN_WARNING "%s: skb too large(%d/%d)\n", |
352 | __func__, skb->len, ch->maxlen); | 352 | __func__, skb->len, ch->maxlen); |
353 | return -EINVAL; | 353 | return -EINVAL; |
354 | } | 354 | } |
355 | /* HW lock must be obtained */ | 355 | /* HW lock must be obtained */ |
@@ -376,15 +376,15 @@ bchannel_senddata(struct bchannel *ch, struct sk_buff *skb) | |||
376 | } | 376 | } |
377 | if (skb->len > ch->maxlen) { | 377 | if (skb->len > ch->maxlen) { |
378 | printk(KERN_WARNING "%s: skb too large(%d/%d)\n", | 378 | printk(KERN_WARNING "%s: skb too large(%d/%d)\n", |
379 | __func__, skb->len, ch->maxlen); | 379 | __func__, skb->len, ch->maxlen); |
380 | return -EINVAL; | 380 | return -EINVAL; |
381 | } | 381 | } |
382 | /* HW lock must be obtained */ | 382 | /* HW lock must be obtained */ |
383 | /* check for pending next_skb */ | 383 | /* check for pending next_skb */ |
384 | if (ch->next_skb) { | 384 | if (ch->next_skb) { |
385 | printk(KERN_WARNING | 385 | printk(KERN_WARNING |
386 | "%s: next_skb exist ERROR (skb->len=%d next_skb->len=%d)\n", | 386 | "%s: next_skb exist ERROR (skb->len=%d next_skb->len=%d)\n", |
387 | __func__, skb->len, ch->next_skb->len); | 387 | __func__, skb->len, ch->next_skb->len); |
388 | return -EBUSY; | 388 | return -EBUSY; |
389 | } | 389 | } |
390 | if (test_and_set_bit(FLG_TX_BUSY, &ch->Flags)) { | 390 | if (test_and_set_bit(FLG_TX_BUSY, &ch->Flags)) { |