diff options
| author | stephen hemminger <stephen@networkplumber.org> | 2013-07-24 11:52:44 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2013-07-26 15:24:32 -0700 |
| commit | 0fb52a27a04ad88a68a89b1bed32892fb16fa100 (patch) | |
| tree | 6eaf39c7369c6c81f7872917f518005ea0697fbf /drivers/net/team | |
| parent | 93d8bf9fb8f39d6d3e461db60f883d9f81006159 (diff) | |
| download | op-kernel-dev-0fb52a27a04ad88a68a89b1bed32892fb16fa100.zip op-kernel-dev-0fb52a27a04ad88a68a89b1bed32892fb16fa100.tar.gz | |
team: cleanup netpoll clode
This started out with fixing a sparse warning, then I realized that
the wrapper function team_netpoll_info could just be collapsed away
by rolling it into the enable code.
Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
Acked-by: Jiri Pirko <jiri@resnulli.us>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/team')
| -rw-r--r-- | drivers/net/team/team.c | 25 |
1 files changed, 8 insertions, 17 deletions
diff --git a/drivers/net/team/team.c b/drivers/net/team/team.c index 75159e4..9ccccd4 100644 --- a/drivers/net/team/team.c +++ b/drivers/net/team/team.c @@ -1037,6 +1037,9 @@ static int team_port_enable_netpoll(struct team *team, struct team_port *port, struct netpoll *np; int err; + if (!team->dev->npinfo) + return 0; + np = kzalloc(sizeof(*np), gfp); if (!np) return -ENOMEM; @@ -1063,12 +1066,6 @@ static void team_port_disable_netpoll(struct team_port *port) __netpoll_cleanup(np); kfree(np); } - -static struct netpoll_info *team_netpoll_info(struct team *team) -{ - return team->dev->npinfo; -} - #else static int team_port_enable_netpoll(struct team *team, struct team_port *port, gfp_t gfp) @@ -1078,10 +1075,6 @@ static int team_port_enable_netpoll(struct team *team, struct team_port *port, static void team_port_disable_netpoll(struct team_port *port) { } -static struct netpoll_info *team_netpoll_info(struct team *team) -{ - return NULL; -} #endif static void __team_port_change_port_added(struct team_port *port, bool linkup); @@ -1163,13 +1156,11 @@ static int team_port_add(struct team *team, struct net_device *port_dev) goto err_vids_add; } - if (team_netpoll_info(team)) { - err = team_port_enable_netpoll(team, port, GFP_KERNEL); - if (err) { - netdev_err(dev, "Failed to enable netpoll on device %s\n", - portname); - goto err_enable_netpoll; - } + err = team_port_enable_netpoll(team, port, GFP_KERNEL); + if (err) { + netdev_err(dev, "Failed to enable netpoll on device %s\n", + portname); + goto err_enable_netpoll; } err = netdev_master_upper_dev_link(port_dev, dev); |
