aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/bonding
diff options
context:
space:
mode:
authorEric Dumazet <eric.dumazet@gmail.com>2010-11-18 12:33:19 -0500
committerDavid S. Miller <davem@davemloft.net>2010-11-18 12:33:19 -0500
commit866f3b25a2eb60d7529c227a0ecd80c3aba443fd (patch)
treeb11b24cf158a232641548b6c652bf9e001ae1446 /drivers/net/bonding
parentdda0b38692a7298f433b92b1329867b1ecabb4bb (diff)
bonding: IGMP handling cleanup
Instead of iterating in_dev->mc_list from bonding driver, its better to call a helper function provided by igmp.c Details of implementation (locking) are private to igmp code. ip_mc_rejoin_group(struct ip_mc_list *im) becomes ip_mc_rejoin_groups(struct in_device *in_dev); Signed-off-by: Eric Dumazet <eric.dumazet@gmail.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/bonding')
-rw-r--r--drivers/net/bonding/bond_main.c8
1 files changed, 2 insertions, 6 deletions
diff --git a/drivers/net/bonding/bond_main.c b/drivers/net/bonding/bond_main.c
index 518844852f06..e588b2e1c3b3 100644
--- a/drivers/net/bonding/bond_main.c
+++ b/drivers/net/bonding/bond_main.c
@@ -873,15 +873,11 @@ static void bond_mc_del(struct bonding *bond, void *addr)
873static void __bond_resend_igmp_join_requests(struct net_device *dev) 873static void __bond_resend_igmp_join_requests(struct net_device *dev)
874{ 874{
875 struct in_device *in_dev; 875 struct in_device *in_dev;
876 struct ip_mc_list *im;
877 876
878 rcu_read_lock(); 877 rcu_read_lock();
879 in_dev = __in_dev_get_rcu(dev); 878 in_dev = __in_dev_get_rcu(dev);
880 if (in_dev) { 879 if (in_dev)
881 for (im = in_dev->mc_list; im; im = im->next) 880 ip_mc_rejoin_groups(in_dev);
882 ip_mc_rejoin_group(im);
883 }
884
885 rcu_read_unlock(); 881 rcu_read_unlock();
886} 882}
887 883