iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

bonding: modify only neigh_parms owned by us

Browse Source 
Otherwise, on neighbour creation, bond_neigh_init() will be called with a
foreign netdev.

Signed-off-by: Veaceslav Falico <vfalico@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Veaceslav Falico 2013-08-02 19:07:39 +02:00 committed by David S. Miller
parent 63134803a6
commit 9918d5bf32
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
drivers/net/bonding/bond_main.c
View File

@ -3630,11 +3630,17 @@ static int bond_neigh_init(struct neighbour *n)
* The bonding ndo_neigh_setup is called at init time beofre any * The bonding ndo_neigh_setup is called at init time beofre any
* slave exists. So we must declare proxy setup function which will * slave exists. So we must declare proxy setup function which will
* be used at run time to resolve the actual slave neigh param setup. * be used at run time to resolve the actual slave neigh param setup.
*
* It's also called by master devices (such as vlans) to setup their
* underlying devices. In that case - do nothing, we're already set up from
* our init.
*/ */
static int bond_neigh_setup(struct net_device *dev, static int bond_neigh_setup(struct net_device *dev,
struct neigh_parms *parms) struct neigh_parms *parms)
{ {
parms->neigh_setup = bond_neigh_init; /* modify only our neigh_parms */
if (parms->dev == dev)
parms->neigh_setup = bond_neigh_init;
return 0; return 0;
} }