From patchwork Mon Jan 26 06:16:58 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jonathan Toppins X-Patchwork-Id: 432663 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 202DE1402B4 for ; Mon, 26 Jan 2015 17:20:38 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753171AbbAZGUe (ORCPT ); Mon, 26 Jan 2015 01:20:34 -0500 Received: from mail-qc0-f181.google.com ([209.85.216.181]:61287 "EHLO mail-qc0-f181.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752752AbbAZGUQ (ORCPT ); Mon, 26 Jan 2015 01:20:16 -0500 Received: by mail-qc0-f181.google.com with SMTP id l6so5643646qcy.12 for ; Sun, 25 Jan 2015 22:20:16 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=cumulusnetworks.com; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=8247QoHU148unGHWYWDuLOr7m99dkWI1Yi29KKtCfOo=; b=MxCzfHiCjoCj/UxD+TLm2lksMBq3w/n718ABYiqmUCC10sRwKlM1mNNhj6VMZW56LO ZrWz9tSKtrNmsCpk/wM/0YYYnSApIABqVaGTmYWxbgLmQtvDCUTyz2UUJTVXwHrxWEgu ez2riH9oPZ70bA53gKz9A9UWdwZN+o5b7Me90= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=8247QoHU148unGHWYWDuLOr7m99dkWI1Yi29KKtCfOo=; b=aMFcdpLcUUsbqyaGjaz3mgq+9W6bhtP1L9cicEyDkiUiELIdwJsN79amqXr1yyAYO8 VSH6LTEpEIZaStFdXcaInYNj7Z589OreqVEP+iS5OPB30Mu+zCnSm/N9dlqF9NC4Ew2R TSqgjlyL41zYkmqMfk+bE8YMLcygc7OpZJUpf+g8v1PB2adxrANXhbpClm1BTQUzm+fj 9IOOsaKMM9cblxEI8s/LYqPhQp2CGwwzPGq7w9j9kbPw+l9gGA3VAUWYLc8NYtbIKn9W /LMu/bTfy682gLecoRsS/S4nA1zuLpfofyjXqG4Netnt92m6+w/djHnADY6UDe6exBX7 EYEw== X-Gm-Message-State: ALoCoQkUeZcrZK2ACZu+JayL7Pk/UZajppsszJs5gwXPDYGdPSvKnxTkCVB26DzYvuxbNZoVAUVQ X-Received: by 10.140.39.179 with SMTP id v48mr20194201qgv.77.1422253216130; Sun, 25 Jan 2015 22:20:16 -0800 (PST) Received: from debian-devel.instigatornetwork.net (cpe-173-095-150-122.nc.res.rr.com. [173.95.150.122]) by mx.google.com with ESMTPSA id r9sm5530610qac.27.2015.01.25.22.20.15 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 25 Jan 2015 22:20:15 -0800 (PST) From: Jonathan Toppins To: Jay Vosburgh , Veaceslav Falico , Andy Gospodarek Cc: netdev@vger.kernel.org, Wilson Kok , Andy Gospodarek Subject: [PATCH net-next v2 2/5] bonding: fix bond_open() don't always set slave active flag Date: Mon, 26 Jan 2015 01:16:58 -0500 Message-Id: <1422253021-3798-3-git-send-email-jtoppins@cumulusnetworks.com> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1422253021-3798-1-git-send-email-jtoppins@cumulusnetworks.com> References: <1422253021-3798-1-git-send-email-jtoppins@cumulusnetworks.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Wilson Kok Mode 802.3ad, fix incorrect bond slave active state when slave is not in active aggregator. During bond_open(), the bonding driver always sets the slave active flag to true if the bond is not in active-backup, alb, or tlb modes. Bonding should let the aggregator selection logic set the active flag when in 802.3ad mode. Cc: Andy Gospodarek Reviewed-by: Nikolay Aleksandrov Signed-off-by: Wilson Kok Signed-off-by: Jonathan Toppins Signed-off-by: Jay Vosburgh --- drivers/net/bonding/bond_main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/bonding/bond_main.c b/drivers/net/bonding/bond_main.c index 02ffedb..c475d90 100644 --- a/drivers/net/bonding/bond_main.c +++ b/drivers/net/bonding/bond_main.c @@ -3066,7 +3066,7 @@ static int bond_open(struct net_device *bond_dev) slave != rcu_access_pointer(bond->curr_active_slave)) { bond_set_slave_inactive_flags(slave, BOND_SLAVE_NOTIFY_NOW); - } else { + } else if (BOND_MODE(bond) != BOND_MODE_8023AD) { bond_set_slave_active_flags(slave, BOND_SLAVE_NOTIFY_NOW); }