diff options
| author | stephen hemminger <stephen@networkplumber.org> | 2013-07-24 11:53:57 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2013-07-26 15:24:47 -0700 |
| commit | 10eccb46b521359fa344f63459087df722f0776d (patch) | |
| tree | 9d4852aeb947710feb812a59c9a538d89a754d29 | |
| parent | 0fb52a27a04ad88a68a89b1bed32892fb16fa100 (diff) | |
| download | linux-10eccb46b521359fa344f63459087df722f0776d.tar.bz2 | |
bond: cleanup netpoll code
This started out with fixing a sparse warning, then I realized that
the wrapper function bond_netpoll_info could just be removed
by rolling it into the enable code.
Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
Reviewed-by: Jiri Pirko <jiri@resnulli.us>
Acked-by: Neil Horman <nhorman@tuxdriver.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | drivers/net/bonding/bond_main.c | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/drivers/net/bonding/bond_main.c b/drivers/net/bonding/bond_main.c index fc10c12bb304..f58435242c50 100644 --- a/drivers/net/bonding/bond_main.c +++ b/drivers/net/bonding/bond_main.c @@ -1245,12 +1245,6 @@ static int bond_netpoll_setup(struct net_device *dev, struct netpoll_info *ni, g } return err; } - -static struct netpoll_info *bond_netpoll_info(struct bonding *bond) -{ - return bond->dev->npinfo; -} - #else static inline int slave_enable_netpoll(struct slave *slave) { @@ -1795,7 +1789,7 @@ int bond_enslave(struct net_device *bond_dev, struct net_device *slave_dev) bond_set_carrier(bond); #ifdef CONFIG_NET_POLL_CONTROLLER - slave_dev->npinfo = bond_netpoll_info(bond); + slave_dev->npinfo = bond->dev->npinfo; if (slave_dev->npinfo) { if (slave_enable_netpoll(new_slave)) { read_unlock(&bond->lock); |