From: Manish Chopra Date: Thu, 15 Aug 2013 12:29:29 +0000 (-0400) Subject: qlcnic: Fix diagnostic interrupt test for 83xx adapters X-Git-Tag: upstream/snapshot3+hdmi~4549^2~2 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=d1fcc172570fa4de69c60bdabe1e1ccfcfe80c26;p=platform%2Fadaptation%2Frenesas_rcar%2Frenesas_kernel.git qlcnic: Fix diagnostic interrupt test for 83xx adapters o Do not allow interrupt test when adapter is resetting. Signed-off-by: Manish Chopra Signed-off-by: Sucheta Chakraborty Signed-off-by: David S. Miller --- diff --git a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_hw.c b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_hw.c index 92da998..9d4bb7f 100644 --- a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_hw.c +++ b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_hw.c @@ -3266,6 +3266,11 @@ int qlcnic_83xx_interrupt_test(struct net_device *netdev) u8 val; int ret, max_sds_rings = adapter->max_sds_rings; + if (test_bit(__QLCNIC_RESETTING, &adapter->state)) { + netdev_info(netdev, "Device is resetting\n"); + return -EBUSY; + } + if (qlcnic_get_diag_lock(adapter)) { netdev_info(netdev, "Device in diagnostics mode\n"); return -EBUSY;