diff options
| author | David S. Miller <davem@davemloft.net> | 2009-10-27 01:03:26 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-10-27 01:03:26 -0700 |
| commit | cfadf853f6cd9689f79a63ca960c6f9d6665314f (patch) | |
| tree | 35418e342d9783f0974ea33ef03875aa21d2362a /drivers/net/bonding | |
| parent | 05423b241311c9380b7280179295bac7794281b6 (diff) | |
| parent | f568a926a353d6816b3704d7367f34371df44ce7 (diff) | |
| download | talos-obmc-linux-cfadf853f6cd9689f79a63ca960c6f9d6665314f.tar.gz talos-obmc-linux-cfadf853f6cd9689f79a63ca960c6f9d6665314f.zip | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/sh_eth.c
Diffstat (limited to 'drivers/net/bonding')
| -rw-r--r-- | drivers/net/bonding/bond_main.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/net/bonding/bond_main.c b/drivers/net/bonding/bond_main.c index feb03ad0d803..3adbeed2c057 100644 --- a/drivers/net/bonding/bond_main.c +++ b/drivers/net/bonding/bond_main.c @@ -3704,10 +3704,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; } /* @@ -3734,7 +3734,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; } /* @@ -3745,7 +3745,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 ----------------------------*/ |
