diff options
author | Patrick McHardy <kaber@trash.net> | 2009-06-12 02:22:29 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2009-06-13 04:18:50 -0400 |
commit | 5b548140225c6bbbbd560551dd1048b2c0ce58be (patch) | |
tree | 9306a37dbca0095ca6d88e0b0ab297bcb2dc5ae8 /drivers/net/wireless/wavelan.c | |
parent | 5b2c4b972c0226406361f83b747eb5cdab51e68e (diff) |
net: use symbolic values for ndo_start_xmit() return codes
Convert magic values 1 and -1 to NETDEV_TX_BUSY and NETDEV_TX_LOCKED respectively.
0 (NETDEV_TX_OK) is not changed to keep the noise down, except in very few cases
where its in direct proximity to one of the other values.
Signed-off-by: Patrick McHardy <kaber@trash.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/wireless/wavelan.c')
-rw-r--r-- | drivers/net/wireless/wavelan.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/wireless/wavelan.c b/drivers/net/wireless/wavelan.c index 25d27b64f528..ab7fc5c0c8b4 100644 --- a/drivers/net/wireless/wavelan.c +++ b/drivers/net/wireless/wavelan.c | |||
@@ -2867,7 +2867,7 @@ static int wavelan_packet_xmit(struct sk_buff *skb, struct net_device * dev) | |||
2867 | spin_unlock_irqrestore(&lp->spinlock, flags); | 2867 | spin_unlock_irqrestore(&lp->spinlock, flags); |
2868 | /* Check that we can continue */ | 2868 | /* Check that we can continue */ |
2869 | if (lp->tx_n_in_use == (NTXBLOCKS - 1)) | 2869 | if (lp->tx_n_in_use == (NTXBLOCKS - 1)) |
2870 | return 1; | 2870 | return NETDEV_TX_BUSY; |
2871 | } | 2871 | } |
2872 | 2872 | ||
2873 | /* Do we need some padding? */ | 2873 | /* Do we need some padding? */ |
@@ -2880,10 +2880,10 @@ static int wavelan_packet_xmit(struct sk_buff *skb, struct net_device * dev) | |||
2880 | skb_copy_from_linear_data(skb, data, skb->len); | 2880 | skb_copy_from_linear_data(skb, data, skb->len); |
2881 | /* Write packet on the card */ | 2881 | /* Write packet on the card */ |
2882 | if(wv_packet_write(dev, data, ETH_ZLEN)) | 2882 | if(wv_packet_write(dev, data, ETH_ZLEN)) |
2883 | return 1; /* We failed */ | 2883 | return NETDEV_TX_BUSY; /* We failed */ |
2884 | } | 2884 | } |
2885 | else if(wv_packet_write(dev, skb->data, skb->len)) | 2885 | else if(wv_packet_write(dev, skb->data, skb->len)) |
2886 | return 1; /* We failed */ | 2886 | return NETDEV_TX_BUSY; /* We failed */ |
2887 | 2887 | ||
2888 | 2888 | ||
2889 | dev_kfree_skb(skb); | 2889 | dev_kfree_skb(skb); |