diff options
| author | Auke Kok <auke-jan.h.kok@intel.com> | 2008-02-11 09:26:01 -0800 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2008-02-11 14:51:40 -0500 |
| commit | 4bebfaa56b72c94fe4997240ee73ad1c1fcf96c9 (patch) | |
| tree | 613a3b78e862090cbe45c92a9ad673499ce640be | |
| parent | 0c254d863338ceff630814bf17cf8e4b61cb8aa3 (diff) | |
| download | op-kernel-dev-4bebfaa56b72c94fe4997240ee73ad1c1fcf96c9.zip op-kernel-dev-4bebfaa56b72c94fe4997240ee73ad1c1fcf96c9.tar.gz | |
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.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/net/ixgbe/ixgbe_main.c b/drivers/net/ixgbe/ixgbe_main.c index 576fb51e..a4aeaec 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) 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); |
