From mboxrd@z Thu Jan 1 00:00:00 1970 From: Veaceslav Falico Subject: Re: [PATCH net-next 1/4] bonding: update the primary when slave name changed Date: Thu, 9 Jan 2014 12:46:36 +0100 Message-ID: <20140109114636.GF5786@redhat.com> References: <52CE8604.3010804@huawei.com> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii; format=flowed Cc: Jay Vosburgh , "David S. Miller" , Netdev To: Ding Tianhong Return-path: Received: from mx1.redhat.com ([209.132.183.28]:9181 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750882AbaAILtk (ORCPT ); Thu, 9 Jan 2014 06:49:40 -0500 Content-Disposition: inline In-Reply-To: <52CE8604.3010804@huawei.com> Sender: netdev-owner@vger.kernel.org List-ID: On Thu, Jan 09, 2014 at 07:20:36PM +0800, Ding Tianhong wrote: >If the primary_slave's name changed, but the bond->prams.primay was >still using the old name, it is conflict with the meaning of the >primary, so update the primary when the slave change its name. Nope, the bonding parameter, which is set by the user, shouldn't change because of an interface name change. > >Signed-off-by: Ding Tianhong >--- > drivers/net/bonding/bond_main.c | 14 ++++++++++++-- > 1 file changed, 12 insertions(+), 2 deletions(-) > >diff --git a/drivers/net/bonding/bond_main.c b/drivers/net/bonding/bond_main.c >index e06c445..de646e2 100644 >--- a/drivers/net/bonding/bond_main.c >+++ b/drivers/net/bonding/bond_main.c >@@ -2860,9 +2860,19 @@ static int bond_slave_netdev_event(unsigned long event, > */ > break; > case NETDEV_CHANGENAME: >- /* >- * TODO: handle changing the primary's name >+ /* if the primary's name changed, >+ * save the new name for primary. > */ >+ if (USES_PRIMARY(bond->params.mode) && >+ bond->params.primary[0]) { >+ if (bond->primary_slave && >+ strcmp(bond->params.primary, >+ bond->primary_slave->dev->name)) { >+ strncpy(bond->params.primary, >+ bond->primary_slave->dev->name, >+ IFNAMSIZ); >+ } >+ } > break; > case NETDEV_FEAT_CHANGE: > bond_compute_features(bond); >-- >1.8.0 > >