diff options
author | Stephen Hemminger <shemminger@vyatta.com> | 2009-08-31 15:50:45 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2009-09-01 04:13:22 -0400 |
commit | 25a79c41ce0ce88a4288adf278e9b0e00f228383 (patch) | |
tree | 4b1c76c704c3956478e76b51d34643a1caf80368 /drivers/net/usb/usbnet.c | |
parent | 8b62ff2dbc3d6c13997b9d440dfd0ed00e6df96d (diff) |
usbnet: convert to netdev_tx_t
Signed-off-by: Stephen Hemminger <shemminger@vyatta.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/usb/usbnet.c')
-rw-r--r-- | drivers/net/usb/usbnet.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/net/usb/usbnet.c b/drivers/net/usb/usbnet.c index 7d471fca2743..d166e3385c64 100644 --- a/drivers/net/usb/usbnet.c +++ b/drivers/net/usb/usbnet.c | |||
@@ -1007,15 +1007,16 @@ EXPORT_SYMBOL_GPL(usbnet_tx_timeout); | |||
1007 | 1007 | ||
1008 | /*-------------------------------------------------------------------------*/ | 1008 | /*-------------------------------------------------------------------------*/ |
1009 | 1009 | ||
1010 | int usbnet_start_xmit (struct sk_buff *skb, struct net_device *net) | 1010 | netdev_tx_t usbnet_start_xmit (struct sk_buff *skb, |
1011 | struct net_device *net) | ||
1011 | { | 1012 | { |
1012 | struct usbnet *dev = netdev_priv(net); | 1013 | struct usbnet *dev = netdev_priv(net); |
1013 | int length; | 1014 | int length; |
1014 | int retval = NET_XMIT_SUCCESS; | ||
1015 | struct urb *urb = NULL; | 1015 | struct urb *urb = NULL; |
1016 | struct skb_data *entry; | 1016 | struct skb_data *entry; |
1017 | struct driver_info *info = dev->driver_info; | 1017 | struct driver_info *info = dev->driver_info; |
1018 | unsigned long flags; | 1018 | unsigned long flags; |
1019 | int retval; | ||
1019 | 1020 | ||
1020 | // some devices want funky USB-level framing, for | 1021 | // some devices want funky USB-level framing, for |
1021 | // win32 driver (usually) and/or hardware quirks | 1022 | // win32 driver (usually) and/or hardware quirks |
@@ -1079,7 +1080,6 @@ int usbnet_start_xmit (struct sk_buff *skb, struct net_device *net) | |||
1079 | if (netif_msg_tx_err (dev)) | 1080 | if (netif_msg_tx_err (dev)) |
1080 | devdbg (dev, "drop, code %d", retval); | 1081 | devdbg (dev, "drop, code %d", retval); |
1081 | drop: | 1082 | drop: |
1082 | retval = NET_XMIT_SUCCESS; | ||
1083 | dev->net->stats.tx_dropped++; | 1083 | dev->net->stats.tx_dropped++; |
1084 | if (skb) | 1084 | if (skb) |
1085 | dev_kfree_skb_any (skb); | 1085 | dev_kfree_skb_any (skb); |
@@ -1088,7 +1088,7 @@ drop: | |||
1088 | devdbg (dev, "> tx, len %d, type 0x%x", | 1088 | devdbg (dev, "> tx, len %d, type 0x%x", |
1089 | length, skb->protocol); | 1089 | length, skb->protocol); |
1090 | } | 1090 | } |
1091 | return retval; | 1091 | return NETDEV_TX_OK; |
1092 | } | 1092 | } |
1093 | EXPORT_SYMBOL_GPL(usbnet_start_xmit); | 1093 | EXPORT_SYMBOL_GPL(usbnet_start_xmit); |
1094 | 1094 | ||