1 files changed, 10 insertions, 19 deletions

diff --git a/drivers/net/bonding/bond_main.c b/drivers/net/bonding/bond_main.c
index b46cb139477d..ecbe206f90d1 100644
--- a/drivers/net/bonding/bond_main.c
+++ b/drivers/net/bonding/bond_main.c
@@ -184,9 +184,6 @@ static int arp_ip_count;
 static int bond_mode    = BOND_MODE_ROUNDROBIN;
 static int xmit_hashtype = BOND_XMIT_POLICY_LAYER2;
 static int lacp_fast;
-#ifdef CONFIG_NET_POLL_CONTROLLER
-static int disable_netpoll = 1;
-#endif
 
 const struct bond_parm_tbl bond_lacp_tbl[] = {
 {       "slow",         AD_LACP_SLOW},
@@ -1811,19 +1808,15 @@ int bond_enslave(struct net_device *bond_dev, struct net_device *slave_dev)
         bond_set_carrier(bond);
 
 #ifdef CONFIG_NET_POLL_CONTROLLER
-        if (disable_netpoll) {
+        if (slaves_support_netpoll(bond_dev)) {
+                bond_dev->priv_flags &= ~IFF_DISABLE_NETPOLL;
+                if (bond_dev->npinfo)
+                        slave_dev->npinfo = bond_dev->npinfo;
+        } else if (!(bond_dev->priv_flags & IFF_DISABLE_NETPOLL)) {
                 bond_dev->priv_flags |= IFF_DISABLE_NETPOLL;
-        } else {
-                if (slaves_support_netpoll(bond_dev)) {
-                        bond_dev->priv_flags &= ~IFF_DISABLE_NETPOLL;
-                        if (bond_dev->npinfo)
-                                slave_dev->npinfo = bond_dev->npinfo;
-                } else if (!(bond_dev->priv_flags & IFF_DISABLE_NETPOLL)) {
-                        bond_dev->priv_flags |= IFF_DISABLE_NETPOLL;
-                        pr_info("New slave device %s does not support netpoll\n",
-                                slave_dev->name);
-                        pr_info("Disabling netpoll support for %s\n", bond_dev->name);
-                }
+                pr_info("New slave device %s does not support netpoll\n",
+                        slave_dev->name);
+                pr_info("Disabling netpoll support for %s\n", bond_dev->name);
         }
 #endif
         read_unlock(&bond->lock);
@@ -2030,10 +2023,8 @@ int bond_release(struct net_device *bond_dev, struct net_device *slave_dev)
 #ifdef CONFIG_NET_POLL_CONTROLLER
         read_lock_bh(&bond->lock);
 
-         /* Make sure netpoll over stays disabled until fixed. */
-        if (!disable_netpoll)
-                if (slaves_support_netpoll(bond_dev))
-                                bond_dev->priv_flags &= ~IFF_DISABLE_NETPOLL;
+        if (slaves_support_netpoll(bond_dev))
+                bond_dev->priv_flags &= ~IFF_DISABLE_NETPOLL;
         read_unlock_bh(&bond->lock);
         if (slave_dev->netdev_ops->ndo_netpoll_cleanup)
                 slave_dev->netdev_ops->ndo_netpoll_cleanup(slave_dev);