diff options
author | Oliver Neukum <oliver@neukum.org> | 2010-07-02 09:51:55 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2010-07-05 21:50:55 -0400 |
commit | c31fd6c25c4619c0745b12cff842721a4bd4202c (patch) | |
tree | 2f2c0efc80a2bcb949d06a20f738068c63fcd516 /drivers/net/usb/ipheth.c | |
parent | 396e799c3ac29f970c40bde87b76f4652c06df76 (diff) |
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>
Diffstat (limited to 'drivers/net/usb/ipheth.c')
-rw-r--r-- | drivers/net/usb/ipheth.c | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/drivers/net/usb/ipheth.c b/drivers/net/usb/ipheth.c index 197c352c47fb..08e7b6abacdd 100644 --- a/drivers/net/usb/ipheth.c +++ b/drivers/net/usb/ipheth.c | |||
@@ -193,7 +193,7 @@ static void ipheth_rcvbulk_callback(struct urb *urb) | |||
193 | case 0: | 193 | case 0: |
194 | break; | 194 | break; |
195 | default: | 195 | default: |
196 | err("%s: urb status: %d", __func__, urb->status); | 196 | err("%s: urb status: %d", __func__, status); |
197 | return; | 197 | return; |
198 | } | 198 | } |
199 | 199 | ||
@@ -222,16 +222,17 @@ static void ipheth_rcvbulk_callback(struct urb *urb) | |||
222 | static void ipheth_sndbulk_callback(struct urb *urb) | 222 | static void ipheth_sndbulk_callback(struct urb *urb) |
223 | { | 223 | { |
224 | struct ipheth_device *dev; | 224 | struct ipheth_device *dev; |
225 | int status = urb->status; | ||
225 | 226 | ||
226 | dev = urb->context; | 227 | dev = urb->context; |
227 | if (dev == NULL) | 228 | if (dev == NULL) |
228 | return; | 229 | return; |
229 | 230 | ||
230 | if (urb->status != 0 && | 231 | if (status != 0 && |
231 | urb->status != -ENOENT && | 232 | status != -ENOENT && |
232 | urb->status != -ECONNRESET && | 233 | status != -ECONNRESET && |
233 | urb->status != -ESHUTDOWN) | 234 | status != -ESHUTDOWN) |
234 | err("%s: urb status: %d", __func__, urb->status); | 235 | err("%s: urb status: %d", __func__, status); |
235 | 236 | ||
236 | dev_kfree_skb_irq(dev->tx_skb); | 237 | dev_kfree_skb_irq(dev->tx_skb); |
237 | netif_wake_queue(dev->net); | 238 | netif_wake_queue(dev->net); |