diff options
| author |   stephen hemminger <stephen@networkplumber.org> | 2013-07-24 11:51:41 -0700 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2013-07-26 15:24:32 -0700 |
| commit | 93d8bf9fb8f39d6d3e461db60f883d9f81006159 (patch) | |
| tree | 76a01206abcaa10ba5c2733257306cb85eb75e4d /net/bridge/br_private.h | |
| parent | bonding: use pre-defined macro in bond_mode_name instead of magic number 0 (diff) | |
| download | linux-dev-93d8bf9fb8f39d6d3e461db60f883d9f81006159.tar.xz linux-dev-93d8bf9fb8f39d6d3e461db60f883d9f81006159.zip | |
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_private.h')
| -rw-r--r-- | net/bridge/br_private.h | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/net/bridge/br_private.h b/net/bridge/br_private.h index 3be89b3ce17b..43347f129943 100644 --- a/net/bridge/br_private.h +++ b/net/bridge/br_private.h @@ -333,11 +333,6 @@ extern void br_dev_delete(struct net_device *dev, struct list_head *list); extern netdev_tx_t br_dev_xmit(struct sk_buff *skb, struct net_device *dev); #ifdef CONFIG_NET_POLL_CONTROLLER -static inline struct netpoll_info *br_netpoll_info(struct net_bridge *br) -{ - return br->dev->npinfo; -} - static inline void br_netpoll_send_skb(const struct net_bridge_port *p, struct sk_buff *skb) { @@ -350,11 +345,6 @@ static inline void br_netpoll_send_skb(const struct net_bridge_port *p, extern int br_netpoll_enable(struct net_bridge_port *p, gfp_t gfp); extern void br_netpoll_disable(struct net_bridge_port *p); #else -static inline struct netpoll_info *br_netpoll_info(struct net_bridge *br) -{ - return NULL; -} - static inline void br_netpoll_send_skb(const struct net_bridge_port *p, struct sk_buff *skb) { |