diff options
| author | David S. Miller <davem@davemloft.net> | 2009-10-30 00:28:59 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-10-30 00:28:59 -0400 |
| commit | 0519d83d83ed485b5a1f9222ff69d7d6c9bb8a01 (patch) | |
| tree | 2e336be8a4bd2e59bcd4b69b00feb77c6672a9cb /drivers/net/bonding | |
| parent | 38bfd8f5bec496e8e0db8849e01c99a33479418a (diff) | |
| parent | b5dd884e682cae6b8c037f9d11f3b623b4cf2011 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
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 8c5ebfb0680f..db82876ceb28 100644 --- a/drivers/net/bonding/bond_main.c +++ b/drivers/net/bonding/bond_main.c | |||
| @@ -707,7 +707,7 @@ static int bond_check_dev_link(struct bonding *bond, | |||
| 707 | struct net_device *slave_dev, int reporting) | 707 | struct net_device *slave_dev, int reporting) |
| 708 | { | 708 | { |
| 709 | const struct net_device_ops *slave_ops = slave_dev->netdev_ops; | 709 | const struct net_device_ops *slave_ops = slave_dev->netdev_ops; |
| 710 | static int (*ioctl)(struct net_device *, struct ifreq *, int); | 710 | int (*ioctl)(struct net_device *, struct ifreq *, int); |
| 711 | struct ifreq ifr; | 711 | struct ifreq ifr; |
| 712 | struct mii_ioctl_data *mii; | 712 | struct mii_ioctl_data *mii; |
| 713 | 713 | ||