diff options
| author | Patrick McHardy <kaber@trash.net> | 2009-03-05 10:57:44 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-03-05 10:57:44 +0100 |
| commit | 72e2240f181871675d3a979766330c91d48a1673 (patch) | |
| tree | b6905491b40a80761e153e5532f69d4bbc3aac76 /drivers/net/bonding | |
| parent | Merge branch 'master' of /home/davem/src/GIT/linux-2.6/ (diff) | |
| download | linux-72e2240f181871675d3a979766330c91d48a1673.tar.xz linux-72e2240f181871675d3a979766330c91d48a1673.zip | |
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>
Diffstat (limited to 'drivers/net/bonding')
| -rw-r--r-- | drivers/net/bonding/bond_main.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/bonding/bond_main.c b/drivers/net/bonding/bond_main.c index 9fb388388fb7..e0578fe8c0db 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; } |