Merge upstream 2.6.13-rc3 into ieee80211 branch of netdev-2.6.

2 files changed, 5 insertions, 5 deletions

diff --git a/drivers/usb/net/kaweth.c b/drivers/usb/net/kaweth.c
index fd6ff4cb2c62..7ffa99b9760f 100644
--- a/drivers/usb/net/kaweth.c
+++ b/drivers/usb/net/kaweth.c
@@ -477,7 +477,7 @@ static int kaweth_reset(struct kaweth_device *kaweth)
 }
 
 static void kaweth_usb_receive(struct urb *, struct pt_regs *regs);
-static int kaweth_resubmit_rx_urb(struct kaweth_device *, int);
+static int kaweth_resubmit_rx_urb(struct kaweth_device *, unsigned);
 
 /****************************************************************
         int_callback
@@ -550,7 +550,7 @@ static void kaweth_resubmit_tl(void *d)
  *     kaweth_resubmit_rx_urb
  ****************************************************************/
 static int kaweth_resubmit_rx_urb(struct kaweth_device *kaweth,
-                                                int mem_flags)
+                                                unsigned mem_flags)
 {
         int result;
 
diff --git a/drivers/usb/net/usbnet.c b/drivers/usb/net/usbnet.c
index 8a945f4f3693..576f3b852fce 100644
--- a/drivers/usb/net/usbnet.c
+++ b/drivers/usb/net/usbnet.c
@@ -3227,9 +3227,9 @@ static int usbnet_stop (struct net_device *net)
         temp = unlink_urbs (dev, &dev->txq) + unlink_urbs (dev, &dev->rxq);
 
         // maybe wait for deletions to finish.
-        while (skb_queue_len (&dev->rxq)
-                        && skb_queue_len (&dev->txq)
-                        && skb_queue_len (&dev->done)) {
+        while (!skb_queue_empty(&dev->rxq) &&
+               !skb_queue_empty(&dev->txq) &&
+               !skb_queue_empty(&dev->done)) {
                 msleep(UNLINK_TIMEOUT_MS);
                 if (netif_msg_ifdown (dev))
                         devdbg (dev, "waited for %d urb completions", temp);