|
@@ -3714,11 +3714,17 @@ 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)
|
|
|
{
|
|
|
- parms->neigh_setup = bond_neigh_init;
|
|
|
+ /* modify only our neigh_parms */
|
|
|
+ if (parms->dev == dev)
|
|
|
+ parms->neigh_setup = bond_neigh_init;
|
|
|
|
|
|
return 0;
|
|
|
}
|