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/wan | |
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/wan')
-rw-r--r-- | drivers/net/wan/dlci.c | 6 | ||||
-rw-r--r-- | drivers/net/wan/sbni.c | 2 | ||||
-rw-r--r-- | drivers/net/wan/wanxl.c | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/drivers/net/wan/dlci.c b/drivers/net/wan/dlci.c index e8d155c3e59f..2fa275a58f9d 100644 --- a/drivers/net/wan/dlci.c +++ b/drivers/net/wan/dlci.c | |||
@@ -205,15 +205,15 @@ static int dlci_transmit(struct sk_buff *skb, struct net_device *dev) | |||
205 | { | 205 | { |
206 | case DLCI_RET_OK: | 206 | case DLCI_RET_OK: |
207 | dev->stats.tx_packets++; | 207 | dev->stats.tx_packets++; |
208 | ret = 0; | 208 | ret = NETDEV_TX_OK; |
209 | break; | 209 | break; |
210 | case DLCI_RET_ERR: | 210 | case DLCI_RET_ERR: |
211 | dev->stats.tx_errors++; | 211 | dev->stats.tx_errors++; |
212 | ret = 0; | 212 | ret = NETDEV_TX_OK; |
213 | break; | 213 | break; |
214 | case DLCI_RET_DROP: | 214 | case DLCI_RET_DROP: |
215 | dev->stats.tx_dropped++; | 215 | dev->stats.tx_dropped++; |
216 | ret = 1; | 216 | ret = NETDEV_TX_BUSY; |
217 | break; | 217 | break; |
218 | } | 218 | } |
219 | /* Alan Cox recommends always returning 0, and always freeing the packet */ | 219 | /* Alan Cox recommends always returning 0, and always freeing the packet */ |
diff --git a/drivers/net/wan/sbni.c b/drivers/net/wan/sbni.c index f4211fe0f445..3fb9dbc88a1a 100644 --- a/drivers/net/wan/sbni.c +++ b/drivers/net/wan/sbni.c | |||
@@ -469,7 +469,7 @@ sbni_start_xmit( struct sk_buff *skb, struct net_device *dev ) | |||
469 | } | 469 | } |
470 | } | 470 | } |
471 | 471 | ||
472 | return 1; | 472 | return NETDEV_TX_BUSY; |
473 | } | 473 | } |
474 | 474 | ||
475 | #else /* CONFIG_SBNI_MULTILINE */ | 475 | #else /* CONFIG_SBNI_MULTILINE */ |
diff --git a/drivers/net/wan/wanxl.c b/drivers/net/wan/wanxl.c index 8130b79a8a99..e4ad7b6b52eb 100644 --- a/drivers/net/wan/wanxl.c +++ b/drivers/net/wan/wanxl.c | |||
@@ -283,7 +283,7 @@ static int wanxl_xmit(struct sk_buff *skb, struct net_device *dev) | |||
283 | #endif | 283 | #endif |
284 | netif_stop_queue(dev); | 284 | netif_stop_queue(dev); |
285 | spin_unlock_irq(&port->lock); | 285 | spin_unlock_irq(&port->lock); |
286 | return 1; /* request packet to be queued */ | 286 | return NETDEV_TX_BUSY; /* request packet to be queued */ |
287 | } | 287 | } |
288 | 288 | ||
289 | #ifdef DEBUG_PKT | 289 | #ifdef DEBUG_PKT |