diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2009-09-04 11:33:59 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2009-09-04 11:33:59 +1000 |
| commit | 4f130f0d56141feae10c8a1140a74f8d227c0638 (patch) | |
| tree | 845fb5ac2d240489ad4b68af6ca57aa34b71e048 /drivers/staging/otus/usbdrv.c | |
| parent | 81957a36b93cd372fb4cfb476c0481d4a9c08ded (diff) | |
| parent | 55f9d6786de2f9cf37db50dbe8ae16f887f3ad7f (diff) | |
Merge commit 'net/master'
Diffstat (limited to 'drivers/staging/otus/usbdrv.c')
| -rw-r--r-- | drivers/staging/otus/usbdrv.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/staging/otus/usbdrv.c b/drivers/staging/otus/usbdrv.c index 540cbbb826f9..7cd87caa6812 100644 --- a/drivers/staging/otus/usbdrv.c +++ b/drivers/staging/otus/usbdrv.c @@ -659,7 +659,7 @@ int usbdrv_xmit_frame(struct sk_buff *skb, struct net_device *dev) netif_stop_queue(dev); } - return 0; + return NETDEV_TX_OK; } @@ -796,13 +796,13 @@ int zfLnxVapXmitFrame(struct sk_buff *skb, struct net_device *dev) if (vapId >= ZM_VAP_PORT_NUMBER) { dev_kfree_skb_irq(skb); - return 0; + return NETDEV_TX_OK; } #if 1 if (vap[vapId].openFlag == 0) { dev_kfree_skb_irq(skb); - return 0; + return NETDEV_TX_OK; } #endif @@ -819,7 +819,7 @@ int zfLnxVapXmitFrame(struct sk_buff *skb, struct net_device *dev) netif_stop_queue(dev); } - return 0; + return NETDEV_TX_OK; } static const struct net_device_ops vap_netdev_ops = { |