usbnet: remove direct access to urb->status

USB drivers should not use urb->status directly because
it is scheduled to become a parameter. This does the conversion
for drivers/net/usb

Signed-off-by: Oliver Neukum <oneukum@suse.de>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/usb/cdc-phonet.c b/drivers/net/usb/cdc-phonet.c
index dc9444525b4901c2035d50e5c84b7f39b510bc6d..109751bad3bb39e39799bb9638e7a947fa11677d 100644 (file)
--- a/drivers/net/usb/cdc-phonet.c
+++ b/drivers/net/usb/cdc-phonet.c
@@ -97,8 +97,9 @@ static void tx_complete(struct urb *req)
        struct sk_buff *skb = req->context;
        struct net_device *dev = skb->dev;
        struct usbpn_dev *pnd = netdev_priv(dev);
+       int status = req->status;
 
-       switch (req->status) {
+       switch (status) {
        case 0:
                dev->stats.tx_bytes += skb->len;
                break;
@@ -109,7 +110,7 @@ static void tx_complete(struct urb *req)
                dev->stats.tx_aborted_errors++;
        default:
                dev->stats.tx_errors++;
-               dev_dbg(&dev->dev, "TX error (%d)\n", req->status);
+               dev_dbg(&dev->dev, "TX error (%d)\n", status);
        }
        dev->stats.tx_packets++;
 
@@ -150,8 +151,9 @@ static void rx_complete(struct urb *req)
        struct page *page = virt_to_page(req->transfer_buffer);
        struct sk_buff *skb;
        unsigned long flags;
+       int status = req->status;
 
-       switch (req->status) {
+       switch (status) {
        case 0:
                spin_lock_irqsave(&pnd->rx_lock, flags);
                skb = pnd->rx_skb;

diff --git a/drivers/net/usb/ipheth.c b/drivers/net/usb/ipheth.c
index 197c352c47fb0233f7502fc4e12a7e7a16a4fcb9..08e7b6abacdd29f3fc78678834ed54feeabe6c6d 100644 (file)
--- a/drivers/net/usb/ipheth.c
+++ b/drivers/net/usb/ipheth.c
@@ -193,7 +193,7 @@ static void ipheth_rcvbulk_callback(struct urb *urb)
        case 0:
                break;
        default:
-               err("%s: urb status: %d", __func__, urb->status);
+               err("%s: urb status: %d", __func__, status);
                return;
        }
 
@@ -222,16 +222,17 @@ static void ipheth_rcvbulk_callback(struct urb *urb)
 static void ipheth_sndbulk_callback(struct urb *urb)
 {
        struct ipheth_device *dev;
+       int status = urb->status;
 
        dev = urb->context;
        if (dev == NULL)
                return;
 
-       if (urb->status != 0 &&
-           urb->status != -ENOENT &&
-           urb->status != -ECONNRESET &&
-           urb->status != -ESHUTDOWN)
-               err("%s: urb status: %d", __func__, urb->status);
+       if (status != 0 &&
+           status != -ENOENT &&
+           status != -ECONNRESET &&
+           status != -ESHUTDOWN)
+               err("%s: urb status: %d", __func__, status);
 
        dev_kfree_skb_irq(dev->tx_skb);
        netif_wake_queue(dev->net);