summaryrefslogtreecommitdiff
path: root/net/bridge/br_if.c
diff options
context:
space:
mode:
authorstephen hemminger <stephen@networkplumber.org>2013-07-24 22:51:41 +0400
committerDavid S. Miller <davem@davemloft.net>2013-07-27 02:24:32 +0400
commit93d8bf9fb8f39d6d3e461db60f883d9f81006159 (patch)
tree76a01206abcaa10ba5c2733257306cb85eb75e4d /net/bridge/br_if.c
parentf52809483caceaf83bd2c7915a35ace3b6e7b0ef (diff)
downloadlinux-93d8bf9fb8f39d6d3e461db60f883d9f81006159.tar.xz
bridge: cleanup netpoll code
This started out with fixing a sparse warning, then I realized that the wrapper function br_netpoll_info could just be collapsed away by rolling it into the enable code. Also, eliminate unnecessary goto's 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>
Diffstat (limited to 'net/bridge/br_if.c')
-rw-r--r--net/bridge/br_if.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/net/bridge/br_if.c b/net/bridge/br_if.c
index 5623be6b9ecd..aa6c9a8ba32a 100644
--- a/net/bridge/br_if.c
+++ b/net/bridge/br_if.c
@@ -363,7 +363,8 @@ int br_add_if(struct net_bridge *br, struct net_device *dev)
if (err)
goto err2;
- if (br_netpoll_info(br) && ((err = br_netpoll_enable(p, GFP_KERNEL))))
+ err = br_netpoll_enable(p, GFP_KERNEL);
+ if (err)
goto err3;
err = netdev_master_upper_dev_link(dev, br->dev);