bond: check if slave count is 0 in case when deciding to take slave's mac
Subsystems (3)
PATCH 1/1 bond: check if slave count is 0 in case when deciding to take slave's mac
in bond_enslave(), check slave_cnt before actually using slave address.
introduced by:
commit 409cc1f8a41 (bond: have random dev address by default instead of zeroes)
Reported-by Greg Rose <[email protected]>
Signed-off-by Jiri Pirko <[email protected]>
--- drivers/net/bonding/bond_main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/bonding/bond_main.c +1 -1
@@ -1629,7 +1629,7 @@ int bond_enslave(struct net_device *bond_dev, struct net_device *slave_dev)/* If this is the first slave, then we need to set the master's hardware * address to be the same as the slave's. */ -if (bond->dev_addr_from_first) +if (bond->slave_cnt ==0 && bond->dev_addr_from_first)bond_set_dev_addr (bond->dev, slave_dev); new_slave =kzalloc (sizeof (struct slave ),GFP_KERNEL );
Signature · 1 line
1.8.1.2
From: Jiri Pirko <[email protected]>
Date: Tue, 26 Feb 2013 09:26:15 +0100
Quoted 7 lines
in
bond_enslave(), checkslave_cntbefore actually using slave address.introduced by:
commit409cc1f8a41(bond: have random dev address by default instead of zeroes)Reported-by Greg Rose <[email protected]>Signed-off-by Jiri Pirko <[email protected]>
Applied, thanks Jiri.