From: Patrick McHardy <kaber@trash.net>
Date: Thu, 5 Mar 2009 09:57:44 +0000 (-0800)
Subject: bonding: Fix device passed into ->ndo_neigh_setup().
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=72e2240f181871675d3a979766330c91d48a1673;p=linux-2.6-omap-h63xx.git

bonding: Fix device passed into ->ndo_neigh_setup().

Signed-off-by: Patrick McHardy <kaber@trash.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
---

diff --git a/drivers/net/bonding/bond_main.c b/drivers/net/bonding/bond_main.c
index 9fb388388fb..e0578fe8c0d 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;
 }