diff options
author | Patrick McHardy <kaber@trash.net> | 2009-07-05 22:23:38 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2009-07-05 22:23:38 -0400 |
commit | ec634fe328182a1a098585bfc7b69e5042bdb08d (patch) | |
tree | 02883aaee743af10d78d6d8fe9181944b4dd4529 /drivers/net/bonding | |
parent | a73e76e23c20c05cb8c0b7ba8bc9daa04b05c80f (diff) |
net: convert remaining non-symbolic return values in ndo_start_xmit() functions
This patch converts the remaining occurences of raw return values to their
symbolic counterparts in ndo_start_xmit() functions that were missed by the
previous automatic conversion.
Additionally code that assumed the symbolic value of NETDEV_TX_OK to be zero
is changed to explicitly use NETDEV_TX_OK.
Signed-off-by: Patrick McHardy <kaber@trash.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/bonding')
-rw-r--r-- | drivers/net/bonding/bond_3ad.c | 2 | ||||
-rw-r--r-- | drivers/net/bonding/bond_alb.c | 2 | ||||
-rw-r--r-- | drivers/net/bonding/bond_main.c | 8 |
3 files changed, 6 insertions, 6 deletions
diff --git a/drivers/net/bonding/bond_3ad.c b/drivers/net/bonding/bond_3ad.c index d4b570886c6e..0e7dfe0981d9 100644 --- a/drivers/net/bonding/bond_3ad.c +++ b/drivers/net/bonding/bond_3ad.c | |||
@@ -2431,7 +2431,7 @@ out: | |||
2431 | dev_kfree_skb(skb); | 2431 | dev_kfree_skb(skb); |
2432 | } | 2432 | } |
2433 | read_unlock(&bond->lock); | 2433 | read_unlock(&bond->lock); |
2434 | return 0; | 2434 | return NETDEV_TX_OK; |
2435 | } | 2435 | } |
2436 | 2436 | ||
2437 | int bond_3ad_lacpdu_recv(struct sk_buff *skb, struct net_device *dev, struct packet_type* ptype, struct net_device *orig_dev) | 2437 | int bond_3ad_lacpdu_recv(struct sk_buff *skb, struct net_device *dev, struct packet_type* ptype, struct net_device *orig_dev) |
diff --git a/drivers/net/bonding/bond_alb.c b/drivers/net/bonding/bond_alb.c index 46d312bedfb8..bf45d2002924 100644 --- a/drivers/net/bonding/bond_alb.c +++ b/drivers/net/bonding/bond_alb.c | |||
@@ -1413,7 +1413,7 @@ out: | |||
1413 | } | 1413 | } |
1414 | read_unlock(&bond->curr_slave_lock); | 1414 | read_unlock(&bond->curr_slave_lock); |
1415 | read_unlock(&bond->lock); | 1415 | read_unlock(&bond->lock); |
1416 | return 0; | 1416 | return NETDEV_TX_OK; |
1417 | } | 1417 | } |
1418 | 1418 | ||
1419 | void bond_alb_monitor(struct work_struct *work) | 1419 | void bond_alb_monitor(struct work_struct *work) |
diff --git a/drivers/net/bonding/bond_main.c b/drivers/net/bonding/bond_main.c index d927f71af8a3..66596d80b505 100644 --- a/drivers/net/bonding/bond_main.c +++ b/drivers/net/bonding/bond_main.c | |||
@@ -4277,7 +4277,7 @@ out: | |||
4277 | dev_kfree_skb(skb); | 4277 | dev_kfree_skb(skb); |
4278 | } | 4278 | } |
4279 | read_unlock(&bond->lock); | 4279 | read_unlock(&bond->lock); |
4280 | return 0; | 4280 | return NETDEV_TX_OK; |
4281 | } | 4281 | } |
4282 | 4282 | ||
4283 | 4283 | ||
@@ -4308,7 +4308,7 @@ out: | |||
4308 | 4308 | ||
4309 | read_unlock(&bond->curr_slave_lock); | 4309 | read_unlock(&bond->curr_slave_lock); |
4310 | read_unlock(&bond->lock); | 4310 | read_unlock(&bond->lock); |
4311 | return 0; | 4311 | return NETDEV_TX_OK; |
4312 | } | 4312 | } |
4313 | 4313 | ||
4314 | /* | 4314 | /* |
@@ -4354,7 +4354,7 @@ out: | |||
4354 | dev_kfree_skb(skb); | 4354 | dev_kfree_skb(skb); |
4355 | } | 4355 | } |
4356 | read_unlock(&bond->lock); | 4356 | read_unlock(&bond->lock); |
4357 | return 0; | 4357 | return NETDEV_TX_OK; |
4358 | } | 4358 | } |
4359 | 4359 | ||
4360 | /* | 4360 | /* |
@@ -4414,7 +4414,7 @@ out: | |||
4414 | 4414 | ||
4415 | /* frame sent to all suitable interfaces */ | 4415 | /* frame sent to all suitable interfaces */ |
4416 | read_unlock(&bond->lock); | 4416 | read_unlock(&bond->lock); |
4417 | return 0; | 4417 | return NETDEV_TX_OK; |
4418 | } | 4418 | } |
4419 | 4419 | ||
4420 | /*------------------------- Device initialization ---------------------------*/ | 4420 | /*------------------------- Device initialization ---------------------------*/ |