[<prev] [next>] [<thread-prev] [day] [month] [year] [list]
Message-ID: <52D58BA0.7040905@cogentembedded.com>
Date: Tue, 14 Jan 2014 22:10:24 +0300
From: Sergei Shtylyov <sergei.shtylyov@...entembedded.com>
To: Veaceslav Falico <vfalico@...hat.com>, netdev@...r.kernel.org
CC: Ding Tianhong <dingtianhong@...wei.com>,
Jay Vosburgh <fubar@...ibm.com>,
Andy Gospodarek <andy@...yhouse.net>
Subject: Re: [PATCH v3 net-next] bonding: handle slave's name change with
primary_slave logic
Hello.
On 01/14/2014 08:35 PM, Veaceslav Falico wrote:
> Currently, if a slave's name change, we just pass it by. However, if the
> slave is a current primary_slave, then we end up with using a slave, whose
> name != params.primary, for primary_slave. And vice-versa, if we don't have
> a primary_slave but have params.primary set - we will not detected a new
> primary_slave.
> Fix this by catching the NETDEV_CHANGENAME event and setting primary_slave
> accordingly. Also, if the primary_slave was changed, issue a reselection of
> the active slave, cause the priorities have changed.
> Reported-by: Ding Tianhong <dingtianhong@...wei.com>
> CC: Ding Tianhong <dingtianhong@...wei.com>
> CC: Jay Vosburgh <fubar@...ibm.com>
> CC: Andy Gospodarek <andy@...yhouse.net>
> Signed-off-by: Veaceslav Falico <vfalico@...hat.com>
> ---
> Notes:
> v2->v3:
> Reword the info message, per Jay's comment.
> v1->v2:
> Proper patch
> drivers/net/bonding/bond_main.c | 23 ++++++++++++++++++++---
> 1 file changed, 20 insertions(+), 3 deletions(-)
> diff --git a/drivers/net/bonding/bond_main.c b/drivers/net/bonding/bond_main.c
> index e06c445..ea51661 100644
> --- a/drivers/net/bonding/bond_main.c
> +++ b/drivers/net/bonding/bond_main.c
> @@ -2860,9 +2860,26 @@ static int bond_slave_netdev_event(unsigned long event,
> */
> break;
> case NETDEV_CHANGENAME:
> - /*
> - * TODO: handle changing the primary's name
> - */
> + /* we don't care if we don't have primary set */
> + if (!USES_PRIMARY(bond->params.mode) ||
> + !bond->params.primary[0])
> + break;
> +
> + if (slave == bond->primary_slave) {
> + /* slave's name changed - he's no longer primary */
> + bond->primary_slave = NULL;
> + } else if (!strcmp(slave_dev->name, bond->params.primary)) {
> + /* we have a new primary slave */
> + bond->primary_slave = slave;
> + } else /* we didn't change primary - exit */
> + break;
*else* should have {} too, as the other *if* arms have it. Source:
Documentation/CodingStyle.
WBR, Sergei
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Powered by blists - more mailing lists