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 /net | |
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 'net')
-rw-r--r-- | net/mac80211/tx.c | 2 | ||||
-rw-r--r-- | net/rose/rose_dev.c | 2 | ||||
-rw-r--r-- | net/sched/sch_teql.c | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/net/mac80211/tx.c b/net/mac80211/tx.c index 364222bfb10d..d238a8939a09 100644 --- a/net/mac80211/tx.c +++ b/net/mac80211/tx.c | |||
@@ -1615,7 +1615,7 @@ int ieee80211_subif_start_xmit(struct sk_buff *skb, | |||
1615 | { | 1615 | { |
1616 | struct ieee80211_sub_if_data *sdata = IEEE80211_DEV_TO_SUB_IF(dev); | 1616 | struct ieee80211_sub_if_data *sdata = IEEE80211_DEV_TO_SUB_IF(dev); |
1617 | struct ieee80211_local *local = sdata->local; | 1617 | struct ieee80211_local *local = sdata->local; |
1618 | int ret = 1, head_need; | 1618 | int ret = NETDEV_TX_BUSY, head_need; |
1619 | u16 ethertype, hdrlen, meshhdrlen = 0; | 1619 | u16 ethertype, hdrlen, meshhdrlen = 0; |
1620 | __le16 fc; | 1620 | __le16 fc; |
1621 | struct ieee80211_hdr hdr; | 1621 | struct ieee80211_hdr hdr; |
diff --git a/net/rose/rose_dev.c b/net/rose/rose_dev.c index 7dcf2569613b..389d6e0d7740 100644 --- a/net/rose/rose_dev.c +++ b/net/rose/rose_dev.c | |||
@@ -137,7 +137,7 @@ static int rose_xmit(struct sk_buff *skb, struct net_device *dev) | |||
137 | 137 | ||
138 | if (!netif_running(dev)) { | 138 | if (!netif_running(dev)) { |
139 | printk(KERN_ERR "ROSE: rose_xmit - called when iface is down\n"); | 139 | printk(KERN_ERR "ROSE: rose_xmit - called when iface is down\n"); |
140 | return 1; | 140 | return NETDEV_TX_BUSY; |
141 | } | 141 | } |
142 | dev_kfree_skb(skb); | 142 | dev_kfree_skb(skb); |
143 | stats->tx_errors++; | 143 | stats->tx_errors++; |
diff --git a/net/sched/sch_teql.c b/net/sched/sch_teql.c index cb1cb1e76b9a..9c002b6e0533 100644 --- a/net/sched/sch_teql.c +++ b/net/sched/sch_teql.c | |||
@@ -338,7 +338,7 @@ restart: | |||
338 | 338 | ||
339 | if (busy) { | 339 | if (busy) { |
340 | netif_stop_queue(dev); | 340 | netif_stop_queue(dev); |
341 | return 1; | 341 | return NETDEV_TX_BUSY; |
342 | } | 342 | } |
343 | dev->stats.tx_errors++; | 343 | dev->stats.tx_errors++; |
344 | 344 | ||