---

yaml --- r: 132150 b: refs/heads/master c: 72e2240 h: refs/heads/master v: v3
git-mirror · Mar 5, 2009 · 95c45dd · 95c45dd
1 parent d752532
commit 95c45dd
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 77827a7cf3aa415f8afec6d9d0537dda8de90ef1
+refs/heads/master: 72e2240f181871675d3a979766330c91d48a1673
diff --git a/trunk/drivers/net/bonding/bond_main.c b/trunk/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;
 }