From mboxrd@z Thu Jan 1 00:00:00 1970 From: Mahesh Bandewar Subject: [PATCH v3 3/5] bonding: Initialize the ALB work queue for lb mode only. Date: Wed, 2 Apr 2014 00:00:12 -0700 Message-ID: <1396422012-32022-1-git-send-email-maheshb@google.com> Cc: netdev , Mahesh Bandewar , Eric Dumazet , Maciej Zenczykowski To: Jay Vosburgh , Veaceslav Falico , Andy Gospodarek , David Miller Return-path: Received: from mail-oa0-f74.google.com ([209.85.219.74]:33541 "EHLO mail-oa0-f74.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757330AbaDBHAP (ORCPT ); Wed, 2 Apr 2014 03:00:15 -0400 Received: by mail-oa0-f74.google.com with SMTP id i7so2205631oag.3 for ; Wed, 02 Apr 2014 00:00:14 -0700 (PDT) Sender: netdev-owner@vger.kernel.org List-ID: micro change to initialize / cancel the ALB work queue only if the mode selected is ALB or TLB. Change-Id: I27a6cf65f72819889bf15b68f6ef4fca7d617186 Signed-off-by: Mahesh Bandewar --- v2: Rebase v3: Rebase drivers/net/bonding/bond_main.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/drivers/net/bonding/bond_main.c b/drivers/net/bonding/bond_main.c index 6e96d510bc8d..676db41b98bc 100644 --- a/drivers/net/bonding/bond_main.c +++ b/drivers/net/bonding/bond_main.c @@ -3046,7 +3046,8 @@ static void bond_work_init_all(struct bonding *bond) { INIT_DELAYED_WORK(&bond->mcast_work, bond_resend_igmp_join_requests_delayed); - INIT_DELAYED_WORK(&bond->alb_work, bond_alb_monitor); + if (bond_is_lb(bond)) + INIT_DELAYED_WORK(&bond->alb_work, bond_alb_monitor); INIT_DELAYED_WORK(&bond->mii_work, bond_mii_monitor); if (bond->params.mode == BOND_MODE_ACTIVEBACKUP) INIT_DELAYED_WORK(&bond->arp_work, bond_activebackup_arp_mon); @@ -3059,7 +3060,8 @@ static void bond_work_cancel_all(struct bonding *bond) { cancel_delayed_work_sync(&bond->mii_work); cancel_delayed_work_sync(&bond->arp_work); - cancel_delayed_work_sync(&bond->alb_work); + if (bond_is_lb(bond)) + cancel_delayed_work_sync(&bond->alb_work); cancel_delayed_work_sync(&bond->ad_work); cancel_delayed_work_sync(&bond->mcast_work); } -- 1.9.1.423.g4596e3a