aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAuke Kok <auke-jan.h.kok@intel.com>2008-02-11 12:26:01 -0500
committerJeff Garzik <jeff@garzik.org>2008-02-11 14:51:40 -0500
commit4bebfaa56b72c94fe4997240ee73ad1c1fcf96c9 (patch)
tree613a3b78e862090cbe45c92a9ad673499ce640be
parent0c254d863338ceff630814bf17cf8e4b61cb8aa3 (diff)
ixgbe: Disallow device reset during ethtool test
Signed-off-by: Auke Kok <auke-jan.h.kok@intel.com> Signed-off-by: Jeff Garzik <jeff@garzik.org>
-rw-r--r--drivers/net/ixgbe/ixgbe_main.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/net/ixgbe/ixgbe_main.c b/drivers/net/ixgbe/ixgbe_main.c
index 576fb51eb748..a4aeaec1b298 100644
--- a/drivers/net/ixgbe/ixgbe_main.c
+++ b/drivers/net/ixgbe/ixgbe_main.c
@@ -1942,6 +1942,10 @@ static int ixgbe_open(struct net_device *netdev)
1942 int err; 1942 int err;
1943 u32 num_rx_queues = adapter->num_rx_queues; 1943 u32 num_rx_queues = adapter->num_rx_queues;
1944 1944
1945 /* disallow open during test */
1946 if (test_bit(__IXGBE_TESTING, &adapter->state))
1947 return -EBUSY;
1948
1945try_intr_reinit: 1949try_intr_reinit:
1946 /* allocate transmit descriptors */ 1950 /* allocate transmit descriptors */
1947 err = ixgbe_setup_all_tx_resources(adapter); 1951 err = ixgbe_setup_all_tx_resources(adapter);