[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <537D5F93.4090308@huawei.com>
Date: Thu, 22 May 2014 10:23:15 +0800
From: Ding Tianhong <dingtianhong@...wei.com>
To: Veaceslav Falico <vfalico@...il.com>, <netdev@...r.kernel.org>
CC: Jay Vosburgh <j.vosburgh@...il.com>,
Andy Gospodarek <andy@...yhouse.net>
Subject: Re: [PATCH net-next 1/2] bonding: populate essential new_slave->bond/dev
early
On 2014/5/21 23:42, Veaceslav Falico wrote:
> The new bond_free_slave() needs new_slave->bond to verify if additional
> structures were allocated, so populate it early so that, in case of failure
> in bond_enslave(), we would be able to get it.
>
> Also populate the new_slave->dev field, as it's too one of the most needed
> things to assign early.
>
> CC: Jay Vosburgh <j.vosburgh@...il.com>
> CC: Andy Gospodarek <andy@...yhouse.net>
> Signed-off-by: Veaceslav Falico <vfalico@...il.com>
> ---
> drivers/net/bonding/bond_main.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/net/bonding/bond_main.c b/drivers/net/bonding/bond_main.c
> index 7123205..923cdd5a 100644
> --- a/drivers/net/bonding/bond_main.c
> +++ b/drivers/net/bonding/bond_main.c
> @@ -1325,6 +1325,8 @@ int bond_enslave(struct net_device *bond_dev, struct net_device *slave_dev)
> goto err_undo_flags;
> }
>
> + new_slave->bond = bond;
> + new_slave->dev = slave_dev;
> /*
> * Set the new_slave's queue_id to be zero. Queue ID mapping
> * is set via sysfs or module option if desired.
> @@ -1368,8 +1370,6 @@ int bond_enslave(struct net_device *bond_dev, struct net_device *slave_dev)
> goto err_restore_mac;
> }
>
> - new_slave->bond = bond;
> - new_slave->dev = slave_dev;
> slave_dev->priv_flags |= IFF_BONDING;
>
> if (bond_is_lb(bond)) {
>
Good catch.
Acked-by: Ding Tianhong <dingtianhong@...wei.com>
--
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