This commit was manufactured by cvs2svn to create tag

[linux-2.6.git] / net / irda / irlan / irlan_client.c

diff --git a/net/irda/irlan/irlan_client.c b/net/irda/irlan/irlan_client.c
index 90c8221..b849ecd 100644 (file)
--- a/net/irda/irlan/irlan_client.c
+++ b/net/irda/irlan/irlan_client.c
@@ -33,10 +33,10 @@
 #include <linux/netdevice.h>
 #include <linux/etherdevice.h>
 #include <linux/if_arp.h>
-#include <linux/bitops.h>
 #include <net/arp.h>
 
 #include <asm/system.h>
+#include <asm/bitops.h>
 #include <asm/byteorder.h>
 
 #include <net/irda/irda.h>
@@ -234,7 +234,7 @@ static void irlan_client_ctrl_disconnect_indication(void *instance, void *sap,
        ASSERT(tsap == self->client.tsap_ctrl, return;);
 
                /* Remove frames queued on the control channel */
-       while ((skb = skb_dequeue(&self->client.txq)) != NULL) {
+       while ((skb = skb_dequeue(&self->client.txq))) {
                dev_kfree_skb(skb);
        }
        self->client.tx_busy = FALSE;