summaryrefslogtreecommitdiffstats
path: root/drivers/usb
diff options
context:
space:
mode:
authorStephen Hemminger <shemminger@vyatta.com>2009-08-31 21:50:45 +0200
committerDavid S. Miller <davem@davemloft.net>2009-09-01 10:13:22 +0200
commit25a79c41ce0ce88a4288adf278e9b0e00f228383 (patch)
tree4b1c76c704c3956478e76b51d34643a1caf80368 /drivers/usb
parentisdn: convert to netdev_tx_t (diff)
downloadlinux-25a79c41ce0ce88a4288adf278e9b0e00f228383.tar.xz
linux-25a79c41ce0ce88a4288adf278e9b0e00f228383.zip
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/usb')
-rw-r--r--drivers/usb/gadget/u_ether.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/usb/gadget/u_ether.c b/drivers/usb/gadget/u_ether.c
index aac69b591aeb..dc3ebd1e68ca 100644
--- a/drivers/usb/gadget/u_ether.c
+++ b/drivers/usb/gadget/u_ether.c
@@ -465,7 +465,8 @@ static inline int is_promisc(u16 cdc_filter)
return cdc_filter & USB_CDC_PACKET_TYPE_PROMISCUOUS;
}
-static int eth_start_xmit(struct sk_buff *skb, struct net_device *net)
+static netdev_tx_t eth_start_xmit(struct sk_buff *skb,
+ struct net_device *net)
{
struct eth_dev *dev = netdev_priv(net);
int length = skb->len;