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

Commit a361c83c authored by Jasper Spaans's avatar Jasper Spaans Committed by David S. Miller
Browse files

bonding: Remove bond_dev from xmit_hash_policy call. 



Now that the bonding device is no longer used in determining the device to
which to send packets, it can be dropped from the argument list of the various
xmit_hash_policy calls.

Signed-off-by: default avatarJasper Spaans <spaans@fox-it.com>
Acked-by: default avatarEric Dumazet <eric.dumazet@gmail.com>
Signed-off-by: default avatarJay Vosburgh <fubar@us.ibm.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent cfadf853

drivers/net/bonding/bond_3ad.c

+5 −6
Original line number Diff line number Diff line
@@ -2395,7 +2395,7 @@ int bond_3ad_xmit_xor(struct sk_buff *skb, struct net_device *dev) 
		goto out;

	}



	slave_agg_no = bond->xmit_hash_policy(skb, dev, slaves_in_agg);

	slave_agg_no = bond->xmit_hash_policy(skb, slaves_in_agg);



	bond_for_each_slave(bond, slave, i) {

		struct aggregator *agg = SLAVE_AD_INFO(slave).port.aggregator;
@@ -2468,4 +2468,3 @@ int bond_3ad_lacpdu_recv(struct sk_buff *skb, struct net_device *dev, struct pac 


	return ret;

}

drivers/net/bonding/bond_main.c

+4 −7
Original line number Diff line number Diff line
@@ -3696,8 +3696,7 @@ void bond_unregister_arp(struct bonding *bond) 
 * Hash for the output device based upon layer 2 and layer 3 data. If

 * the packet is not IP mimic bond_xmit_hash_policy_l2()

 */

static int bond_xmit_hash_policy_l23(struct sk_buff *skb,

				     struct net_device *bond_dev, int count)

static int bond_xmit_hash_policy_l23(struct sk_buff *skb, int count)

{

	struct ethhdr *data = (struct ethhdr *)skb->data;

	struct iphdr *iph = ip_hdr(skb);
@@ -3715,8 +3714,7 @@ static int bond_xmit_hash_policy_l23(struct sk_buff *skb, 
 * the packet is a frag or not TCP or UDP, just use layer 3 data.  If it is

 * altogether not IP, mimic bond_xmit_hash_policy_l2()

 */

static int bond_xmit_hash_policy_l34(struct sk_buff *skb,

				    struct net_device *bond_dev, int count)

static int bond_xmit_hash_policy_l34(struct sk_buff *skb, int count)

{

	struct ethhdr *data = (struct ethhdr *)skb->data;

	struct iphdr *iph = ip_hdr(skb);
@@ -3740,8 +3738,7 @@ static int bond_xmit_hash_policy_l34(struct sk_buff *skb, 
/*

 * Hash for the output device based upon layer 2 data

 */

static int bond_xmit_hash_policy_l2(struct sk_buff *skb,

				   struct net_device *bond_dev, int count)

static int bond_xmit_hash_policy_l2(struct sk_buff *skb, int count)

{

	struct ethhdr *data = (struct ethhdr *)skb->data;
@@ -4334,7 +4331,7 @@ static int bond_xmit_xor(struct sk_buff *skb, struct net_device *bond_dev) 
	if (!BOND_IS_OK(bond))

		goto out;



	slave_no = bond->xmit_hash_policy(skb, bond_dev, bond->slave_cnt);

	slave_no = bond->xmit_hash_policy(skb, bond->slave_cnt);



	bond_for_each_slave(bond, slave, i) {

		slave_no--;

drivers/net/bonding/bonding.h

+1 −2
Original line number Diff line number Diff line
@@ -206,7 +206,7 @@ struct bonding { 
#endif /* CONFIG_PROC_FS */

	struct   list_head bond_list;

	struct   dev_mc_list *mc_list;

	int      (*xmit_hash_policy)(struct sk_buff *, struct net_device *, int);

	int      (*xmit_hash_policy)(struct sk_buff *, int);

	__be32   master_ip;

	u16      flags;

	u16      rr_tx_counter;
@@ -377,4 +377,3 @@ static inline void bond_unregister_ipv6_notifier(void) 
#endif



#endif /* _LINUX_BONDING_H */