bonding: Re-enable netpoll over bonding

With the inclusion of previous fixup patches, netpoll over bonding apears to
work reliably with failover conditions.  This reverts Gospos previous commit
c22d7ac8, and allows access again to the netpoll
functionality in the bonding driver.
Signed-off-by: Neil Horman <nhorman@tuxdriver.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

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,9 +1808,6 @@ 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) {
-		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)
@@ -1824,7 +1818,6 @@ int bond_enslave(struct net_device *bond_dev, struct net_device *slave_dev)
 			slave_dev->name);
 		pr_info("Disabling netpoll support for %s\n", bond_dev->name);
 	}
-	}
 #endif
 	read_unlock(&bond->lock);
 
@@ -2030,8 +2023,6 @@ 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;
 	read_unlock_bh(&bond->lock);