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

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

bonding: Modify hash transmit policies to use the packet's source MAC address 



Modify bonding hash transmit policies to use the psource MAC address of
the packet instead of the MAC address configured for the bonding device.

The old sitation conflicts with the documentation.

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 66ed1e5e

drivers/net/bonding/bond_main.c

+4 −4
Original line number Diff line number Diff line
@@ -3665,10 +3665,10 @@ static int bond_xmit_hash_policy_l23(struct sk_buff *skb, 


	if (skb->protocol == htons(ETH_P_IP)) {

		return ((ntohl(iph->saddr ^ iph->daddr) & 0xffff) ^

			(data->h_dest[5] ^ bond_dev->dev_addr[5])) % count;

			(data->h_dest[5] ^ data->h_source[5])) % count;

	}



	return (data->h_dest[5] ^ bond_dev->dev_addr[5]) % count;

	return (data->h_dest[5] ^ data->h_source[5]) % count;

}



/*
@@ -3695,7 +3695,7 @@ static int bond_xmit_hash_policy_l34(struct sk_buff *skb, 


	}



	return (data->h_dest[5] ^ bond_dev->dev_addr[5]) % count;

	return (data->h_dest[5] ^ data->h_source[5]) % count;

}



/*
@@ -3706,7 +3706,7 @@ static int bond_xmit_hash_policy_l2(struct sk_buff *skb, 
{

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



	return (data->h_dest[5] ^ bond_dev->dev_addr[5]) % count;

	return (data->h_dest[5] ^ data->h_source[5]) % count;

}



/*-------------------------- Device entry points ----------------------------*/