Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

[PATCH] bonding: cleanup comment for mode 1 IGMP xmit hack

Browse source 
Expand comment explaining MAC address selection for replicated IGMP
frames transmitted in bonding mode 1 (active-backup).  Also, a small
whitespace cleanup.

Signed-off-by: John W. Linville <linville@tuxdriver.com>
Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
This commit is contained in:
John W. Linville 2005-10-18 21:30:58 -04:00 committed by Jeff Garzik
parent 7645baec58
commit df49898a47
1 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
drivers/net/bonding/bond_main.c
View file

@ -4242,8 +4242,8 @@ static int bond_xmit_roundrobin(struct sk_buff *skb, struct net_device *bond_dev
} }
static void bond_activebackup_xmit_copy(struct sk_buff *skb, static void bond_activebackup_xmit_copy(struct sk_buff *skb,
struct bonding *bond, struct bonding *bond,
struct slave *slave) struct slave *slave)
{ {
struct sk_buff *skb2 = skb_copy(skb, GFP_ATOMIC); struct sk_buff *skb2 = skb_copy(skb, GFP_ATOMIC);
struct ethhdr *eth_data; struct ethhdr *eth_data;
@ -4259,7 +4259,11 @@ static void bond_activebackup_xmit_copy(struct sk_buff *skb,
skb2->mac.raw = (unsigned char *)skb2->data; skb2->mac.raw = (unsigned char *)skb2->data;
eth_data = eth_hdr(skb2); eth_data = eth_hdr(skb2);
/* Pick an appropriate source MAC address */ /* Pick an appropriate source MAC address
* -- use slave's perm MAC addr, unless used by bond
* -- otherwise, borrow active slave's perm MAC addr
* since that will not be used
*/
hwaddr = slave->perm_hwaddr; hwaddr = slave->perm_hwaddr;
if (!memcmp(eth_data->h_source, hwaddr, ETH_ALEN)) if (!memcmp(eth_data->h_source, hwaddr, ETH_ALEN))
hwaddr = bond->curr_active_slave->perm_hwaddr; hwaddr = bond->curr_active_slave->perm_hwaddr;