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/cdc-phonet.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/cdc-phonet.c')
-rw-r--r-- | drivers/net/usb/cdc-phonet.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/usb/cdc-phonet.c b/drivers/net/usb/cdc-phonet.c index 792af72da8ac..0ca5916ca8df 100644 --- a/drivers/net/usb/cdc-phonet.c +++ b/drivers/net/usb/cdc-phonet.c | |||
@@ -55,7 +55,7 @@ static void rx_complete(struct urb *req); | |||
55 | /* | 55 | /* |
56 | * Network device callbacks | 56 | * Network device callbacks |
57 | */ | 57 | */ |
58 | static int usbpn_xmit(struct sk_buff *skb, struct net_device *dev) | 58 | static netdev_tx_t usbpn_xmit(struct sk_buff *skb, struct net_device *dev) |
59 | { | 59 | { |
60 | struct usbpn_dev *pnd = netdev_priv(dev); | 60 | struct usbpn_dev *pnd = netdev_priv(dev); |
61 | struct urb *req = NULL; | 61 | struct urb *req = NULL; |
@@ -82,12 +82,12 @@ static int usbpn_xmit(struct sk_buff *skb, struct net_device *dev) | |||
82 | if (pnd->tx_queue >= dev->tx_queue_len) | 82 | if (pnd->tx_queue >= dev->tx_queue_len) |
83 | netif_stop_queue(dev); | 83 | netif_stop_queue(dev); |
84 | spin_unlock_irqrestore(&pnd->tx_lock, flags); | 84 | spin_unlock_irqrestore(&pnd->tx_lock, flags); |
85 | return 0; | 85 | return NETDEV_TX_OK; |
86 | 86 | ||
87 | drop: | 87 | drop: |
88 | dev_kfree_skb(skb); | 88 | dev_kfree_skb(skb); |
89 | dev->stats.tx_dropped++; | 89 | dev->stats.tx_dropped++; |
90 | return 0; | 90 | return NETDEV_TX_OK; |
91 | } | 91 | } |
92 | 92 | ||
93 | static void tx_complete(struct urb *req) | 93 | static void tx_complete(struct urb *req) |