Skip to contentSkip to conversation

bonding: remove unwanted return value for bond_dev_queue_xmit()

PATCH Superseded Ding Tianhong 1 participant 1 message Dec 31, 2013

Subsystems (3)
Networking Network drivers Bonding driver
lore
Share & tools
lore

Ding Tianhong

author
#0 lore raw

PATCH 5/7 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 <[email protected]>
---
 drivers/net/bonding/bond_main.c | 4 +---
 drivers/net/bonding/bonding.h   | 2 +-
 2 files changed, 2 insertions(+), 4 deletions(-)
drivers/net/bonding/bond_main.c +1 -3
index f14e235..e4d5018 100644
@@ -299,7 +299,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;

@@ -312,8 +312,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;
 }
 
 /*
drivers/net/bonding/bonding.h +1 -1
index 5886f07..0f3e270 100644
@@ -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);
 void bond_xmit_slave_id(struct bonding *bond, struct sk_buff *skb, int slave_id);
 int bond_create(struct net *net, const char *name);
 int bond_create_sysfs(struct bond_net *net);
Signature · 1 line
1.8.0