diff options
author | stephen hemminger <shemminger@vyatta.com> | 2010-05-10 11:31:08 +0200 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2010-05-16 08:10:01 +0200 |
commit | cfb478da70f2213520866c84cb0aea0d7c0e1148 (patch) | |
tree | bc1a1ea16bbb2be0481d3231a2fbe5611437da55 /net/bridge/br_private.h | |
parent | rndis_host: Poll status channel before control channel (diff) | |
download | linux-cfb478da70f2213520866c84cb0aea0d7c0e1148.tar.xz linux-cfb478da70f2213520866c84cb0aea0d7c0e1148.zip |
bridge: netpoll cleanup
Move code around so that the ifdef for NETPOLL_CONTROLLER don't have to
show up in main code path. The control functions should be in helpers
that are only compiled if needed.
Signed-off-by: Stephen Hemminger <shemminger@vyatta.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to '')
-rw-r--r-- | net/bridge/br_private.h | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/net/bridge/br_private.h b/net/bridge/br_private.h index 3d2d3fe0a97e..8a072661a744 100644 --- a/net/bridge/br_private.h +++ b/net/bridge/br_private.h @@ -253,8 +253,18 @@ static inline int br_is_root_bridge(const struct net_bridge *br) extern void br_dev_setup(struct net_device *dev); extern netdev_tx_t br_dev_xmit(struct sk_buff *skb, struct net_device *dev); -extern bool br_devices_support_netpoll(struct net_bridge *br); -extern void br_netpoll_cleanup(struct net_device *br_dev); +#ifdef CONFIG_NET_POLL_CONTROLLER +extern void br_netpoll_cleanup(struct net_device *dev); +extern void br_netpoll_enable(struct net_bridge *br, + struct net_device *dev); +extern void br_netpoll_disable(struct net_bridge *br, + struct net_device *dev); +#else +#define br_netpoll_cleanup(br) +#define br_netpoll_enable(br, dev) +#define br_netpoll_disable(br, dev) + +#endif /* br_fdb.c */ extern int br_fdb_init(void); |