Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9918d5bf authored by Veaceslav Falico's avatar Veaceslav Falico Committed by David S. Miller
Browse files

bonding: modify only neigh_parms owned by us 



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

Signed-off-by: default avatarVeaceslav Falico <vfalico@redhat.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 63134803

drivers/net/bonding/bond_main.c

+7 −1
Original line number Diff line number Diff line
@@ -3630,10 +3630,16 @@ static int bond_neigh_init(struct neighbour *n) 
 * The bonding ndo_neigh_setup is called at init time beofre any

 * slave exists. So we must declare proxy setup function which will

 * 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,

			    struct neigh_parms *parms)

{

	/* modify only our neigh_parms */

	if (parms->dev == dev)

		parms->neigh_setup = bond_neigh_init;



	return 0;