From 66f9d03b15687114ac4800e20962bc5e80d618d3 Mon Sep 17 00:00:00 2001
From: Auke Kok <auke-jan.h.kok@intel.com>
Date: Mon, 11 Feb 2008 09:26:01 -0800
Subject: [PATCH] --- yaml --- r: 85818 b: refs/heads/master c:
 4bebfaa56b72c94fe4997240ee73ad1c1fcf96c9 h: refs/heads/master v: v3

---
 [refs]                               | 2 +-
 trunk/drivers/net/ixgbe/ixgbe_main.c | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 760e4bbcdf89..8ebc14f94054 100644
--- 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
index 576fb51eb748..a4aeaec1b298 100644
--- 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);