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>

diff --git a/net/bridge/br_device.c b/net/bridge/br_device.c
index f15f9c4..22b97ba 100644 (file)
--- a/net/bridge/br_device.c
+++ b/net/bridge/br_device.c
@@ -199,7 +199,7 @@ static int br_set_tx_csum(struct net_device *dev, u32 data)
 }
 
 #ifdef CONFIG_NET_POLL_CONTROLLER
-bool br_devices_support_netpoll(struct net_bridge *br)
+static bool br_devices_support_netpoll(struct net_bridge *br)
 {
        struct net_bridge_port *p;
        bool ret = true;
@@ -225,9 +225,9 @@ static void br_poll_controller(struct net_device *br_dev)
                netpoll_poll_dev(np->real_dev);
 }
 
-void br_netpoll_cleanup(struct net_device *br_dev)
+void br_netpoll_cleanup(struct net_device *dev)
 {
-       struct net_bridge *br = netdev_priv(br_dev);
+       struct net_bridge *br = netdev_priv(dev);
        struct net_bridge_port *p, *n;
        const struct net_device_ops *ops;
 
@@ -243,10 +243,30 @@ void br_netpoll_cleanup(struct net_device *br_dev)
        }
 }
 
-#else
+void br_netpoll_disable(struct net_bridge *br,
+                       struct net_device *dev)
+{
+       if (br_devices_support_netpoll(br))
+               br->dev->priv_flags &= ~IFF_DISABLE_NETPOLL;
+       if (dev->netdev_ops->ndo_netpoll_cleanup)
+               dev->netdev_ops->ndo_netpoll_cleanup(dev);
+       else
+               dev->npinfo = NULL;
+}
 
-void br_netpoll_cleanup(struct net_device *br_dev)
+void br_netpoll_enable(struct net_bridge *br,
+                      struct net_device *dev)
 {
+       if (br_devices_support_netpoll(br)) {
+               br->dev->priv_flags &= ~IFF_DISABLE_NETPOLL;
+               if (br->dev->npinfo)
+                       dev->npinfo = br->dev->npinfo;
+       } else if (!(br->dev->priv_flags & IFF_DISABLE_NETPOLL)) {
+               br->dev->priv_flags |= IFF_DISABLE_NETPOLL;
+               printk(KERN_INFO "%s:new device %s"
+                       " does not support netpoll (disabling)",
+                       br->dev->name, dev->name);
+       }
 }
 
 #endif

diff --git a/net/bridge/br_if.c b/net/bridge/br_if.c
index 537bdd6..45f3f88 100644 (file)
--- a/net/bridge/br_if.c
+++ b/net/bridge/br_if.c
@@ -154,14 +154,7 @@ static void del_nbp(struct net_bridge_port *p)
        kobject_uevent(&p->kobj, KOBJ_REMOVE);
        kobject_del(&p->kobj);
 
-#ifdef CONFIG_NET_POLL_CONTROLLER
-       if (br_devices_support_netpoll(br))
-               br->dev->priv_flags &= ~IFF_DISABLE_NETPOLL;
-       if (dev->netdev_ops->ndo_netpoll_cleanup)
-               dev->netdev_ops->ndo_netpoll_cleanup(dev);
-       else
-               dev->npinfo = NULL;
-#endif
+       br_netpoll_disable(br, dev);
        call_rcu(&p->rcu, destroy_nbp_rcu);
 }
 
@@ -455,19 +448,7 @@ int br_add_if(struct net_bridge *br, struct net_device *dev)
 
        kobject_uevent(&p->kobj, KOBJ_ADD);
 
-#ifdef CONFIG_NET_POLL_CONTROLLER
-       if (br_devices_support_netpoll(br)) {
-               br->dev->priv_flags &= ~IFF_DISABLE_NETPOLL;
-               if (br->dev->npinfo)
-                       dev->npinfo = br->dev->npinfo;
-       } else if (!(br->dev->priv_flags & IFF_DISABLE_NETPOLL)) {
-               br->dev->priv_flags |= IFF_DISABLE_NETPOLL;
-               printk(KERN_INFO "New device %s does not support netpoll\n",
-                       dev->name);
-               printk(KERN_INFO "Disabling netpoll for %s\n",
-                       br->dev->name);
-       }
-#endif
+       br_netpoll_enable(br, dev);
 
        return 0;
 err2:

diff --git a/net/bridge/br_private.h b/net/bridge/br_private.h
index 3d2d3fe..8a07266 100644 (file)
--- 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);