diff options
| author | Veaceslav Falico | 2013-08-02 19:07:39 +0200 |
|---|---|---|
| committer | David S. Miller | 2013-08-03 00:44:23 +0200 |
| commit | 9918d5bf329d0dc5bb2d9d293bcb772bdb626e65 (patch) | |
| tree | e7dab36220c48573e4475034c9c68ce083219a93 /drivers/net/bonding/bond_main.c | |
| parent | neighbour: populate neigh_parms on alloc before calling ndo_neigh_setup (diff) | |
| download | kernel-qcow2-linux-9918d5bf329d0dc5bb2d9d293bcb772bdb626e65.tar.gz kernel-qcow2-linux-9918d5bf329d0dc5bb2d9d293bcb772bdb626e65.tar.xz kernel-qcow2-linux-9918d5bf329d0dc5bb2d9d293bcb772bdb626e65.zip | |
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: Veaceslav Falico <vfalico@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/bonding/bond_main.c')
| -rw-r--r-- | drivers/net/bonding/bond_main.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/drivers/net/bonding/bond_main.c b/drivers/net/bonding/bond_main.c index 1d37a9657e0d..476df7d2a354 100644 --- a/drivers/net/bonding/bond_main.c +++ b/drivers/net/bonding/bond_main.c @@ -3630,11 +3630,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; } |