From patchwork Fri Jan 16 15:57:25 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jonathan Toppins X-Patchwork-Id: 429917 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 506A0140273 for ; Sat, 17 Jan 2015 02:58:04 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756567AbbAPP6A (ORCPT ); Fri, 16 Jan 2015 10:58:00 -0500 Received: from mail-qg0-f49.google.com ([209.85.192.49]:58752 "EHLO mail-qg0-f49.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753143AbbAPP5n (ORCPT ); Fri, 16 Jan 2015 10:57:43 -0500 Received: by mail-qg0-f49.google.com with SMTP id f51so16821135qge.8 for ; Fri, 16 Jan 2015 07:57:42 -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=ijcVQN7O4mil4PVEQ+jJzXwJ9uX2kkaGVIyV1YsetZc=; b=P1r8J3nP/N7em3G65NJqlcugNCdRVHzF/SYqqaEa2iYDD/oFXULUls6mJW5N5Rmbi7 Z0/7bxkyB2o/Rx8iqhXE/RiU6yzSMhjKleuBMDEWe+T54pkbticX9j4SomtRBCbwjE78 +infYemu3CL1EnVooQTZNc5Uqqnpktc9HJQMw= 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=ijcVQN7O4mil4PVEQ+jJzXwJ9uX2kkaGVIyV1YsetZc=; b=EbgP/6WhoZ5bR++5uIOopBHablmeulIePc2TI7QaO/ypJXf/rgNP/SXDH4ok4VtWK7 5DHm8FFKK0NtzBWPTNweJCn/rIFGwz8kQh+GFvFd1Q9MUEj1fI3BWfOBbmXo/DSueoJt VtWWPL6nNwvJEjY2RB1GEv2YGq8FzEegWO2zsOFR+b3+qogCc+QWesKRQjVcVzxqjmZ3 d7EyPCiVkbm3q97SzqKKwj+YJm0LvZHUjAvuYNpamsbYL+/dvZBiU8Imdh8OwTCLv+P3 kpTw99XWvIqACjILmpPzzdhb0XLjysA3Ab7cl6pVoGojE9EtLE3OPNzGBpie3TOyW5Z7 YeqA== X-Gm-Message-State: ALoCoQmVNY0T6XsAc7lE2LWkP0taGPcoADre2zVr57UqmaAu+79aGk+FhwtfC12kkv7RJ+kKEGvj X-Received: by 10.224.57.142 with SMTP id c14mr25457378qah.48.1421423862660; Fri, 16 Jan 2015 07:57:42 -0800 (PST) Received: from debian-devel.rtplab.test (rrcs-24-171-185-114.midsouth.biz.rr.com. [24.171.185.114]) by mx.google.com with ESMTPSA id y95sm4475377qgy.14.2015.01.16.07.57.41 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 16 Jan 2015 07:57:42 -0800 (PST) From: Jonathan Toppins To: netdev@vger.kernel.org Cc: Andy Gospodarek , Wilson Kok , Jonathan Toppins Subject: [PATCH net-next 2/5] bonding: fix bond_open() don't always set slave active flag Date: Fri, 16 Jan 2015 10:57:25 -0500 Message-Id: <1421423848-414-3-git-send-email-jtoppins@cumulusnetworks.com> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1421423848-414-1-git-send-email-jtoppins@cumulusnetworks.com> References: <1421423848-414-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 Signed-off-by: Wilson Kok Signed-off-by: Jonathan Toppins --- 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); }