diff options
| author | David S. Miller <davem@davemloft.net> | 2009-03-05 05:06:47 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-03-05 05:06:47 -0500 |
| commit | 508827ff0ac3981d420edac64a70de7f4e304d38 (patch) | |
| tree | b0cee8ddef9f0ceab68c388e4ae46b7295eb2cb5 /drivers/net/bonding | |
| parent | 2c3c3d02f28801d7ad2da4952b2c7ca6621ef221 (diff) | |
| parent | 72e2240f181871675d3a979766330c91d48a1673 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/tokenring/tmspci.c
drivers/net/ucc_geth_mii.c
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 2c96b93b12a5..bfe1ed8389ca 100644 --- a/drivers/net/bonding/bond_main.c +++ b/drivers/net/bonding/bond_main.c | |||
| @@ -4121,7 +4121,7 @@ static int bond_neigh_setup(struct net_device *dev, struct neigh_parms *parms) | |||
| 4121 | const struct net_device_ops *slave_ops | 4121 | const struct net_device_ops *slave_ops |
| 4122 | = slave->dev->netdev_ops; | 4122 | = slave->dev->netdev_ops; |
| 4123 | if (slave_ops->ndo_neigh_setup) | 4123 | if (slave_ops->ndo_neigh_setup) |
| 4124 | return slave_ops->ndo_neigh_setup(dev, parms); | 4124 | return slave_ops->ndo_neigh_setup(slave->dev, parms); |
| 4125 | } | 4125 | } |
| 4126 | return 0; | 4126 | return 0; |
| 4127 | } | 4127 | } |