summaryrefslogtreecommitdiffstats
path: root/drivers/isdn/hisax/isdnl1.c
diff options
context:
space:
mode:
authorJeff Garzik <jgarzik@pobox.com>2005-07-14 01:11:44 +0200
committerJeff Garzik <jgarzik@pobox.com>2005-07-14 01:11:44 +0200
commit08cd84c81f27d5bd22ba958b7cae6d566c509280 (patch)
tree6fdb546c151410851fd3c604d42590afa4215084 /drivers/isdn/hisax/isdnl1.c
parentMerge /spare/repo/netdev-2.6 branch 'ieee80211' (diff)
parentMerge upstream 2.6.13-rc3 into ieee80211 branch of netdev-2.6. (diff)
downloadlinux-08cd84c81f27d5bd22ba958b7cae6d566c509280.tar.xz
linux-08cd84c81f27d5bd22ba958b7cae6d566c509280.zip
Merge /spare/repo/netdev-2.6 branch 'ieee80211'
Diffstat (limited to 'drivers/isdn/hisax/isdnl1.c')
-rw-r--r--drivers/isdn/hisax/isdnl1.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/isdn/hisax/isdnl1.c b/drivers/isdn/hisax/isdnl1.c
index ac899503a74f..bab356886483 100644
--- a/drivers/isdn/hisax/isdnl1.c
+++ b/drivers/isdn/hisax/isdnl1.c
@@ -279,7 +279,8 @@ BChannel_proc_xmt(struct BCState *bcs)
if (test_and_clear_bit(FLG_L1_PULL_REQ, &st->l1.Flags))
st->l1.l1l2(st, PH_PULL | CONFIRM, NULL);
if (!test_bit(BC_FLG_ACTIV, &bcs->Flag)) {
- if (!test_bit(BC_FLG_BUSY, &bcs->Flag) && (!skb_queue_len(&bcs->squeue))) {
+ if (!test_bit(BC_FLG_BUSY, &bcs->Flag) &&
+ skb_queue_empty(&bcs->squeue)) {
st->l2.l2l1(st, PH_DEACTIVATE | CONFIRM, NULL);
}
}