Skip to contentSkip to conversation

usbnet: remove direct access to urb->status

PATCH Applied Oliver Neukum 2 participants 2 messages Jul 2, 2010 – Jul 6, 2010

Subsystems (3)
Networking Network drivers USB networking drivers
lore
Share & tools
lore

Oliver Neukum

author
#0 lore raw

PATCH 1/1 usbnet: remove direct access to urb->status

Quoted 1 line

From a2e8da61490cba876b1b4814c4832822527c43dd Mon Sep 17 00:00:00 2001

From: Oliver Neukum <[email protected]>
Date: Fri, 2 Jul 2010 15:51:55 +0200
Subject: [PATCH] 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 <[email protected]>
---
 drivers/net/usb/cdc-phonet.c |    8 +++++---
 drivers/net/usb/ipheth.c     |   13 +++++++------
 2 files changed, 12 insertions(+), 9 deletions(-)
drivers/net/usb/cdc-phonet.c +5 -3
index dc94445..109751b 100644
@@ -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;
drivers/net/usb/ipheth.c +7 -6
index 197c352..08e7b6a 100644
@@ -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);
Signature · 1 line
1.7.1
maintainer Applied
#1 lore raw

From: Oliver Neukum <[email protected]>
Date: Fri, 2 Jul 2010 15:58:25 +0200

Quoted 10 lines

From a2e8da61490cba876b1b4814c4832822527c43dd Mon Sep 17 00:00:00 2001
From: Oliver Neukum <[email protected]>
Date: Fri, 2 Jul 2010 15:51:55 +0200
Subject: [PATCH] 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 <[email protected]>

Applied.