aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/net/bonding/bond_main.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/bonding/bond_main.c b/drivers/net/bonding/bond_main.c
index da3af631f21b..bc3578e4980a 100644
--- a/drivers/net/bonding/bond_main.c
+++ b/drivers/net/bonding/bond_main.c
@@ -723,7 +723,7 @@ static int bond_set_allmulti(struct bonding *bond, int inc)
723static void bond_resend_igmp_join_requests(struct bonding *bond) 723static void bond_resend_igmp_join_requests(struct bonding *bond)
724{ 724{
725 if (!rtnl_trylock()) { 725 if (!rtnl_trylock()) {
726 queue_delayed_work(bond->wq, &bond->mcast_work, 0); 726 queue_delayed_work(bond->wq, &bond->mcast_work, 1);
727 return; 727 return;
728 } 728 }
729 call_netdevice_notifiers(NETDEV_RESEND_IGMP, bond->dev); 729 call_netdevice_notifiers(NETDEV_RESEND_IGMP, bond->dev);
@@ -1084,7 +1084,7 @@ void bond_change_active_slave(struct bonding *bond, struct slave *new_active)
1084 ((USES_PRIMARY(bond->params.mode) && new_active) || 1084 ((USES_PRIMARY(bond->params.mode) && new_active) ||
1085 bond->params.mode == BOND_MODE_ROUNDROBIN)) { 1085 bond->params.mode == BOND_MODE_ROUNDROBIN)) {
1086 bond->igmp_retrans = bond->params.resend_igmp; 1086 bond->igmp_retrans = bond->params.resend_igmp;
1087 queue_delayed_work(bond->wq, &bond->mcast_work, 0); 1087 queue_delayed_work(bond->wq, &bond->mcast_work, 1);
1088 } 1088 }
1089} 1089}
1090 1090