diff options
| author | dingtianhong <dingtianhong@huawei.com> | 2014-01-02 09:13:09 +0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2014-01-01 22:58:55 -0500 |
| commit | d316dedd4dae67e58976b695d3d0405a9db45246 (patch) | |
| tree | 7ccbfb555e2e136b5b7830aa3101b9d9edba1190 /drivers/net/bonding | |
| parent | 3900f29021f0bc7fe9815aa32f1a993b7dfdd402 (diff) | |
| download | op-kernel-dev-d316dedd4dae67e58976b695d3d0405a9db45246.zip op-kernel-dev-d316dedd4dae67e58976b695d3d0405a9db45246.tar.gz | |
bonding: remove unwanted return value for bond_dev_queue_xmit()
The return value for bond_dev_queue_xmit() will not be used anymore,
so remove the return value.
Signed-off-by: Ding Tianhong <dingtianhong@huawei.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/bonding')
| -rw-r--r-- | drivers/net/bonding/bond_main.c | 4 | ||||
| -rw-r--r-- | drivers/net/bonding/bonding.h | 2 |
2 files changed, 2 insertions, 4 deletions
diff --git a/drivers/net/bonding/bond_main.c b/drivers/net/bonding/bond_main.c index 9efccef..f8ed3bbd 100644 --- a/drivers/net/bonding/bond_main.c +++ b/drivers/net/bonding/bond_main.c @@ -304,7 +304,7 @@ const char *bond_mode_name(int mode) * @skb: hw accel VLAN tagged skb to transmit * @slave_dev: slave that is supposed to xmit this skbuff */ -int bond_dev_queue_xmit(struct bonding *bond, struct sk_buff *skb, +void bond_dev_queue_xmit(struct bonding *bond, struct sk_buff *skb, struct net_device *slave_dev) { skb->dev = slave_dev; @@ -317,8 +317,6 @@ int bond_dev_queue_xmit(struct bonding *bond, struct sk_buff *skb, bond_netpoll_send_skb(bond_get_slave_by_dev(bond, slave_dev), skb); else dev_queue_xmit(skb); - - return 0; } /* diff --git a/drivers/net/bonding/bonding.h b/drivers/net/bonding/bonding.h index 2897137..e39d477 100644 --- a/drivers/net/bonding/bonding.h +++ b/drivers/net/bonding/bonding.h @@ -416,7 +416,7 @@ static inline bool slave_can_tx(struct slave *slave) struct bond_net; int bond_arp_rcv(const struct sk_buff *skb, struct bonding *bond, struct slave *slave); -int bond_dev_queue_xmit(struct bonding *bond, struct sk_buff *skb, struct net_device *slave_dev); +void bond_dev_queue_xmit(struct bonding *bond, struct sk_buff *skb, struct net_device *slave_dev); int bond_create(struct net *net, const char *name); int bond_create_sysfs(struct bond_net *net); void bond_destroy_sysfs(struct bond_net *net); |
