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/isdn/i4l/isdn_net.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/isdn/i4l/isdn_net.c')
-rw-r--r-- | drivers/isdn/i4l/isdn_net.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/isdn/i4l/isdn_net.c b/drivers/isdn/i4l/isdn_net.c index cb8943da4f12..34d54e7281fd 100644 --- a/drivers/isdn/i4l/isdn_net.c +++ b/drivers/isdn/i4l/isdn_net.c | |||
@@ -1069,7 +1069,7 @@ isdn_net_xmit(struct net_device *ndev, struct sk_buff *skb) | |||
1069 | lp = isdn_net_get_locked_lp(nd); | 1069 | lp = isdn_net_get_locked_lp(nd); |
1070 | if (!lp) { | 1070 | if (!lp) { |
1071 | printk(KERN_WARNING "%s: all channels busy - requeuing!\n", ndev->name); | 1071 | printk(KERN_WARNING "%s: all channels busy - requeuing!\n", ndev->name); |
1072 | return 1; | 1072 | return NETDEV_TX_BUSY; |
1073 | } | 1073 | } |
1074 | /* we have our lp locked from now on */ | 1074 | /* we have our lp locked from now on */ |
1075 | 1075 | ||
@@ -1273,14 +1273,14 @@ isdn_net_start_xmit(struct sk_buff *skb, struct net_device *ndev) | |||
1273 | spin_unlock_irqrestore(&dev->lock, flags); | 1273 | spin_unlock_irqrestore(&dev->lock, flags); |
1274 | isdn_net_dial(); /* Initiate dialing */ | 1274 | isdn_net_dial(); /* Initiate dialing */ |
1275 | netif_stop_queue(ndev); | 1275 | netif_stop_queue(ndev); |
1276 | return 1; /* let upper layer requeue skb packet */ | 1276 | return NETDEV_TX_BUSY; /* let upper layer requeue skb packet */ |
1277 | } | 1277 | } |
1278 | #endif | 1278 | #endif |
1279 | /* Initiate dialing */ | 1279 | /* Initiate dialing */ |
1280 | spin_unlock_irqrestore(&dev->lock, flags); | 1280 | spin_unlock_irqrestore(&dev->lock, flags); |
1281 | isdn_net_dial(); | 1281 | isdn_net_dial(); |
1282 | isdn_net_device_stop_queue(lp); | 1282 | isdn_net_device_stop_queue(lp); |
1283 | return 1; | 1283 | return NETDEV_TX_BUSY; |
1284 | } else { | 1284 | } else { |
1285 | isdn_net_unreachable(ndev, skb, | 1285 | isdn_net_unreachable(ndev, skb, |
1286 | "No phone number"); | 1286 | "No phone number"); |