From patchwork Mon Jan 28 17:20:52 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Milos Vyletel X-Patchwork-Id: 216264 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 2500B2C0092 for ; Tue, 29 Jan 2013 04:21:19 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757210Ab3A1RVQ (ORCPT ); Mon, 28 Jan 2013 12:21:16 -0500 Received: from mail4.sde.cz ([85.93.125.197]:44972 "EHLO sde.cz" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1756247Ab3A1RVP (ORCPT ); Mon, 28 Jan 2013 12:21:15 -0500 Received: by sde.cz (Postfix, from userid 1002) id 8017A69F4147; Mon, 28 Jan 2013 18:21:11 +0100 (CET) Received: from leaf-12.tekelec.com (unknown [199.72.20.10]) by sde.cz (Postfix) with ESMTPSA id 96C8C69F4140; Mon, 28 Jan 2013 18:21:10 +0100 (CET) From: Milos Vyletel To: netdev@vger.kernel.org Cc: fubar@us.ibm.com, andy@greyhouse.net, Milos Vyletel Subject: [PATCH] bonding: unset primary slave via sysfs Date: Mon, 28 Jan 2013 12:20:52 -0500 Message-Id: <1359393652-2804-1-git-send-email-milos.vyletel@sde.cz> X-Mailer: git-send-email 1.7.1 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org When bonding module is loaded with primary parameter and one decides to unset primary slave using sysfs these settings are not preserved during bond device restart. Primary slave is only unset once and it's not remembered in bond->params structure. Signed-off-by: Milos Vyletel Reviewed-by: Jiri Pirko Signed-off-by: Jay Vosburgh --- drivers/net/bonding/bond_sysfs.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/drivers/net/bonding/bond_sysfs.c b/drivers/net/bonding/bond_sysfs.c index ef8d2a0..155f3b4 100644 --- a/drivers/net/bonding/bond_sysfs.c +++ b/drivers/net/bonding/bond_sysfs.c @@ -1067,6 +1067,7 @@ static ssize_t bonding_store_primary(struct device *d, pr_info("%s: Setting primary slave to None.\n", bond->dev->name); bond->primary_slave = NULL; + memset(bond->params.primary, 0, sizeof(bond->params.primary)); bond_select_active_slave(bond); goto out; }