---

yaml --- r: 203634 b: refs/heads/master c: 90e1795 h: refs/heads/master v: v3
git-mirror · Jul 19, 2010 · da423e7 · da423e7
1 parent 6745d5a
commit da423e7
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e6e4ec2f98ae3b75cfede011c8794120914e789f
+refs/heads/master: 90e1795b9b18ce47e95cd26028a9cfd0f4cc35ba
diff --git a/trunk/drivers/net/bonding/bond_main.c b/trunk/drivers/net/bonding/bond_main.c
@@ -176,7 +176,9 @@ 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},