Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d316dedd authored by dingtianhong's avatar dingtianhong Committed by David S. Miller
Browse files

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: default avatarDing Tianhong <dingtianhong@huawei.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 3900f290

drivers/net/bonding/bond_main.c

+1 −3
Original line number Diff line number Diff line
@@ -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;

}



/*

drivers/net/bonding/bonding.h

+1 −1
Original line number Diff line number Diff line
@@ -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);