---

yaml --- r: 85818 b: refs/heads/master c: 4bebfaa h: refs/heads/master v: v3
git-mirror · Feb 11, 2008 · 66f9d03 · 66f9d03
1 parent 6e26851
commit 66f9d03
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0c254d863338ceff630814bf17cf8e4b61cb8aa3
+refs/heads/master: 4bebfaa56b72c94fe4997240ee73ad1c1fcf96c9
diff --git a/trunk/drivers/net/ixgbe/ixgbe_main.c b/trunk/drivers/net/ixgbe/ixgbe_main.c
@@ -1942,6 +1942,10 @@ static int ixgbe_open(struct net_device *netdev)
 	int err;
 	u32 num_rx_queues = adapter->num_rx_queues;
 
+	/* disallow open during test */
+	if (test_bit(__IXGBE_TESTING, &adapter->state))
+		return -EBUSY;
+
 try_intr_reinit:
 	/* allocate transmit descriptors */
 	err = ixgbe_setup_all_tx_resources(adapter);