lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
Open Source and information security mailing list archives
| ||
|
Date: Wed, 24 Jul 2013 11:52:44 -0700 From: Stephen Hemminger <stephen@...workplumber.org> To: Stephen Hemminger <stephen@...workplumber.org> Cc: David Miller <davem@...emloft.net>, Neil Horman <nhorman@...driver.com>, Jiri Pirko <jiri@...nulli.us>, Jay Vosburgh <fubar@...ibm.com>, Andy Gospodarek <andy@...yhouse.net>, netdev@...r.kernel.org Subject: [PATCH 2/3 net-next] 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@...workplumber.org> --- a/drivers/net/team/team.c 2013-07-24 08:34:05.257987576 -0700 +++ b/drivers/net/team/team.c 2013-07-24 08:34:10.357931582 -0700 @@ -1037,6 +1037,9 @@ static int team_port_enable_netpoll(stru 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(st __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(stru 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 *te 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); -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@...r.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Powered by blists - more mailing lists