diff options
| author | Patrick McHardy <kaber@trash.net> | 2009-06-12 06:22:29 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-06-13 01:18:50 -0700 |
| commit | 5b548140225c6bbbbd560551dd1048b2c0ce58be (patch) | |
| tree | 9306a37dbca0095ca6d88e0b0ab297bcb2dc5ae8 /drivers/net/arm | |
| parent | 5b2c4b972c0226406361f83b747eb5cdab51e68e (diff) | |
| download | kernel_samsung_tuna-5b548140225c6bbbbd560551dd1048b2c0ce58be.zip kernel_samsung_tuna-5b548140225c6bbbbd560551dd1048b2c0ce58be.tar.gz kernel_samsung_tuna-5b548140225c6bbbbd560551dd1048b2c0ce58be.tar.bz2 | |
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/arm')
| -rw-r--r-- | drivers/net/arm/at91_ether.c | 2 | ||||
| -rw-r--r-- | drivers/net/arm/ether3.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/arm/at91_ether.c b/drivers/net/arm/at91_ether.c index 7f4bc8a..2e7419a 100644 --- a/drivers/net/arm/at91_ether.c +++ b/drivers/net/arm/at91_ether.c @@ -829,7 +829,7 @@ static int at91ether_start_xmit(struct sk_buff *skb, struct net_device *dev) dev->trans_start = jiffies; } else { printk(KERN_ERR "at91_ether.c: at91ether_start_xmit() called, but device is busy!\n"); - return 1; /* if we return anything but zero, dev.c:1055 calls kfree_skb(skb) + return NETDEV_TX_BUSY; /* if we return anything but zero, dev.c:1055 calls kfree_skb(skb) on this skb, he also reports -ENETDOWN and printk's, so either we free and return(0) or don't free and return 1 */ } diff --git a/drivers/net/arm/ether3.c b/drivers/net/arm/ether3.c index ec8a1ae..4550371 100644 --- a/drivers/net/arm/ether3.c +++ b/drivers/net/arm/ether3.c @@ -526,7 +526,7 @@ ether3_sendpacket(struct sk_buff *skb, struct net_device *dev) if (priv(dev)->tx_tail == next_ptr) { local_irq_restore(flags); - return 1; /* unable to queue */ + return NETDEV_TX_BUSY; /* unable to queue */ } dev->trans_start = jiffies; |