Message ID | 1375227846-17761-1-git-send-email-nikolay@redhat.com |
---|---|
State | Changes Requested, archived |
Delegated to: | David Miller |
Headers | show |
From: Nikolay Aleksandrov <nikolay@redhat.com> Date: Wed, 31 Jul 2013 01:44:06 +0200 > From: "nikolay@redhat.com" <nikolay@redhat.com> I don't think that "nikolay@redhat.com" is your name. :-) Please fix this up and resubmit, thanks. -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On 08/01/2013 02:05 AM, David Miller wrote: > From: Nikolay Aleksandrov <nikolay@redhat.com> > Date: Wed, 31 Jul 2013 01:44:06 +0200 > >> From: "nikolay@redhat.com" <nikolay@redhat.com> > > I don't think that "nikolay@redhat.com" is your name. :-) > > Please fix this up and resubmit, thanks. > hehe nothing like a little git mess, will do. Thanks :-) -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/net/bonding/bond_main.c b/drivers/net/bonding/bond_main.c index da3af63..bc3578e 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) static void bond_resend_igmp_join_requests(struct bonding *bond) { if (!rtnl_trylock()) { - queue_delayed_work(bond->wq, &bond->mcast_work, 0); + queue_delayed_work(bond->wq, &bond->mcast_work, 1); return; } call_netdevice_notifiers(NETDEV_RESEND_IGMP, bond->dev); @@ -1084,7 +1084,7 @@ void bond_change_active_slave(struct bonding *bond, struct slave *new_active) ((USES_PRIMARY(bond->params.mode) && new_active) || bond->params.mode == BOND_MODE_ROUNDROBIN)) { bond->igmp_retrans = bond->params.resend_igmp; - queue_delayed_work(bond->wq, &bond->mcast_work, 0); + queue_delayed_work(bond->wq, &bond->mcast_work, 1); } }