diff options
Diffstat (limited to 'drivers')
-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 9efccefbfb68..f8ed3bbd39a0 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) | |||
304 | * @skb: hw accel VLAN tagged skb to transmit | 304 | * @skb: hw accel VLAN tagged skb to transmit |
305 | * @slave_dev: slave that is supposed to xmit this skbuff | 305 | * @slave_dev: slave that is supposed to xmit this skbuff |
306 | */ | 306 | */ |
307 | int bond_dev_queue_xmit(struct bonding *bond, struct sk_buff *skb, | 307 | void bond_dev_queue_xmit(struct bonding *bond, struct sk_buff *skb, |
308 | struct net_device *slave_dev) | 308 | struct net_device *slave_dev) |
309 | { | 309 | { |
310 | skb->dev = slave_dev; | 310 | skb->dev = slave_dev; |
@@ -317,8 +317,6 @@ int bond_dev_queue_xmit(struct bonding *bond, struct sk_buff *skb, | |||
317 | bond_netpoll_send_skb(bond_get_slave_by_dev(bond, slave_dev), skb); | 317 | bond_netpoll_send_skb(bond_get_slave_by_dev(bond, slave_dev), skb); |
318 | else | 318 | else |
319 | dev_queue_xmit(skb); | 319 | dev_queue_xmit(skb); |
320 | |||
321 | return 0; | ||
322 | } | 320 | } |
323 | 321 | ||
324 | /* | 322 | /* |
diff --git a/drivers/net/bonding/bonding.h b/drivers/net/bonding/bonding.h index 2897137e892f..e39d47725b4a 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) | |||
416 | struct bond_net; | 416 | struct bond_net; |
417 | 417 | ||
418 | int bond_arp_rcv(const struct sk_buff *skb, struct bonding *bond, struct slave *slave); | 418 | int bond_arp_rcv(const struct sk_buff *skb, struct bonding *bond, struct slave *slave); |
419 | int bond_dev_queue_xmit(struct bonding *bond, struct sk_buff *skb, struct net_device *slave_dev); | 419 | void bond_dev_queue_xmit(struct bonding *bond, struct sk_buff *skb, struct net_device *slave_dev); |
420 | int bond_create(struct net *net, const char *name); | 420 | int bond_create(struct net *net, const char *name); |
421 | int bond_create_sysfs(struct bond_net *net); | 421 | int bond_create_sysfs(struct bond_net *net); |
422 | void bond_destroy_sysfs(struct bond_net *net); | 422 | void bond_destroy_sysfs(struct bond_net *net); |