Re: [BUG] 2.6.29-rc* QinQ vlan trunking regression

[Patrick McHardy <kaber@trash.net>]

[-- Attachment #1: Type: text/plain, Size: 352 bytes --]

Patrick McHardy wrote:
> Yes, but that patch introduced the requirement to pass the correct
> device down since now the handlers need it to get to the ops of the
> underlying device. Previously they all relied on the handlers not
> using their private data.
>
> Signed-off-by: Patrick McHardy <kaber@trash.net>
>   

Oops, the last patch was broken.



[-- Attachment #2: x --]
[-- Type: text/plain, Size: 521 bytes --]

diff --git a/drivers/net/bonding/bond_main.c b/drivers/net/bonding/bond_main.c
index 9fb3883..e0578fe 100644
--- a/drivers/net/bonding/bond_main.c
+++ b/drivers/net/bonding/bond_main.c
@@ -4113,7 +4113,7 @@ static int bond_neigh_setup(struct net_device *dev, struct neigh_parms *parms)
 		const struct net_device_ops *slave_ops
 			= slave->dev->netdev_ops;
 		if (slave_ops->ndo_neigh_setup)
-			return slave_ops->ndo_neigh_setup(dev, parms);
+			return slave_ops->ndo_neigh_setup(slave->dev, parms);
 	}
 	return 0;
 }