diff options
author | Patrick McHardy <kaber@trash.net> | 2009-06-23 02:03:08 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2009-07-05 22:16:04 -0400 |
commit | 6ed106549d17474ca17a16057f4c0ed4eba5a7ca (patch) | |
tree | b98c09081509b3a9757339b6b66779e4126dfa29 /drivers/usb/gadget | |
parent | 0e8635a8e1f2d4a9e1bfc6c3b21419a5921e674f (diff) |
net: use NETDEV_TX_OK instead of 0 in ndo_start_xmit() functions
This patch is the result of an automatic spatch transformation to convert
all ndo_start_xmit() return values of 0 to NETDEV_TX_OK.
Some occurences are missed by the automatic conversion, those will be
handled in a seperate patch.
Signed-off-by: Patrick McHardy <kaber@trash.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/usb/gadget')
-rw-r--r-- | drivers/usb/gadget/f_phonet.c | 2 | ||||
-rw-r--r-- | drivers/usb/gadget/u_ether.c | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/drivers/usb/gadget/f_phonet.c b/drivers/usb/gadget/f_phonet.c index 96fb118355b0..d17f1082df96 100644 --- a/drivers/usb/gadget/f_phonet.c +++ b/drivers/usb/gadget/f_phonet.c | |||
@@ -256,7 +256,7 @@ out: | |||
256 | dev_kfree_skb(skb); | 256 | dev_kfree_skb(skb); |
257 | dev->stats.tx_dropped++; | 257 | dev->stats.tx_dropped++; |
258 | } | 258 | } |
259 | return 0; | 259 | return NETDEV_TX_OK; |
260 | } | 260 | } |
261 | 261 | ||
262 | static int pn_net_mtu(struct net_device *dev, int new_mtu) | 262 | static int pn_net_mtu(struct net_device *dev, int new_mtu) |
diff --git a/drivers/usb/gadget/u_ether.c b/drivers/usb/gadget/u_ether.c index 016f63b39028..aac69b591aeb 100644 --- a/drivers/usb/gadget/u_ether.c +++ b/drivers/usb/gadget/u_ether.c | |||
@@ -487,7 +487,7 @@ static int eth_start_xmit(struct sk_buff *skb, struct net_device *net) | |||
487 | 487 | ||
488 | if (!in) { | 488 | if (!in) { |
489 | dev_kfree_skb_any(skb); | 489 | dev_kfree_skb_any(skb); |
490 | return 0; | 490 | return NETDEV_TX_OK; |
491 | } | 491 | } |
492 | 492 | ||
493 | /* apply outgoing CDC or RNDIS filters */ | 493 | /* apply outgoing CDC or RNDIS filters */ |
@@ -506,7 +506,7 @@ static int eth_start_xmit(struct sk_buff *skb, struct net_device *net) | |||
506 | type = USB_CDC_PACKET_TYPE_ALL_MULTICAST; | 506 | type = USB_CDC_PACKET_TYPE_ALL_MULTICAST; |
507 | if (!(cdc_filter & type)) { | 507 | if (!(cdc_filter & type)) { |
508 | dev_kfree_skb_any(skb); | 508 | dev_kfree_skb_any(skb); |
509 | return 0; | 509 | return NETDEV_TX_OK; |
510 | } | 510 | } |
511 | } | 511 | } |
512 | /* ignores USB_CDC_PACKET_TYPE_DIRECTED */ | 512 | /* ignores USB_CDC_PACKET_TYPE_DIRECTED */ |
@@ -586,7 +586,7 @@ drop: | |||
586 | list_add(&req->list, &dev->tx_reqs); | 586 | list_add(&req->list, &dev->tx_reqs); |
587 | spin_unlock_irqrestore(&dev->req_lock, flags); | 587 | spin_unlock_irqrestore(&dev->req_lock, flags); |
588 | } | 588 | } |
589 | return 0; | 589 | return NETDEV_TX_OK; |
590 | } | 590 | } |
591 | 591 | ||
592 | /*-------------------------------------------------------------------------*/ | 592 | /*-------------------------------------------------------------------------*/ |