* [patch 2.6.14-rc4] bonding: cleanup comment for mode 1 IGMP xmit hack
@ 2005-10-19 1:30 John W. Linville
2005-10-19 2:27 ` Jeff Garzik
0 siblings, 1 reply; 2+ messages in thread
From: John W. Linville @ 2005-10-19 1:30 UTC (permalink / raw)
To: linux-kernel, netdev; +Cc: jgarzik, ctindel, fubar, bonding-devel
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>
---
drivers/net/bonding/bond_main.c | 10 +++++++---
1 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/drivers/net/bonding/bond_main.c b/drivers/net/bonding/bond_main.c
--- a/drivers/net/bonding/bond_main.c
+++ b/drivers/net/bonding/bond_main.c
@@ -4242,8 +4242,8 @@ out:
}
static void bond_activebackup_xmit_copy(struct sk_buff *skb,
- struct bonding *bond,
- struct slave *slave)
+ struct bonding *bond,
+ struct slave *slave)
{
struct sk_buff *skb2 = skb_copy(skb, GFP_ATOMIC);
struct ethhdr *eth_data;
@@ -4259,7 +4259,11 @@ static void bond_activebackup_xmit_copy(
skb2->mac.raw = (unsigned char *)skb2->data;
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;
if (!memcmp(eth_data->h_source, hwaddr, ETH_ALEN))
hwaddr = bond->curr_active_slave->perm_hwaddr;
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: [patch 2.6.14-rc4] bonding: cleanup comment for mode 1 IGMP xmit hack
2005-10-19 1:30 [patch 2.6.14-rc4] bonding: cleanup comment for mode 1 IGMP xmit hack John W. Linville
@ 2005-10-19 2:27 ` Jeff Garzik
0 siblings, 0 replies; 2+ messages in thread
From: Jeff Garzik @ 2005-10-19 2:27 UTC (permalink / raw)
To: John W. Linville; +Cc: linux-kernel, netdev, ctindel, fubar, bonding-devel
applied
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2005-10-19 2:27 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2005-10-19 1:30 [patch 2.6.14-rc4] bonding: cleanup comment for mode 1 IGMP xmit hack John W. Linville
2005-10-19 2:27 ` Jeff Garzik
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).