Eric Lee / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit f2251f668e9527b87c9ba7256e7497cb49abbc20

Authored by Amit Kumar Salecha
Committed by David S. Miller
1 parent 6f7714196b
Exists in master and in 39 other branches 8mp-imx_5.4.70_2.3.0, 8qm-imx_5.4.70_2.3.0, emb_imx_lf-5.15.y, emb_lf-6.1.y, imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, imx_4.1.15_1.0.0_ga, pitx_8mp_lf-5.10.y, rt-smarc-imx_4.1.15_1.0.0_ga, rt_linux_5.15.71, smarc-8m-android-11.0.0_2.0.0, smarc-imx6_4.14.98_2.0.0_ga, smarc-imx6_4.9.88_2.0.0_ga, smarc-imx7_4.14.98_2.0.0_ga, smarc-imx7_4.9.11_1.0.0_ga, smarc-imx7_4.9.88_2.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-imx_4.1.15_1.0.0_ga, smarc-imx_4.9.11_1.0.0_ga, smarc-imx_4.9.51_imx8m_ga, smarc-imx_4.9.88_2.0.0_ga, smarc-m6.0.1_2.1.0-ga, smarc-n7.1.2_2.0.0-ga, smarc-rel_imx_4.1.15_1.2.0_ga, smarc_8m_00d0_imx_4.14.98_2.0.0_ga, smarc_8m_imx_4.14.78_1.0.0_ga, smarc_8m_imx_4.14.98_2.0.0_ga, smarc_8m_imx_4.19.35_1.1.0, smarc_8mm_imx_4.14.78_1.0.0_ga, smarc_8mm_imx_4.14.98_2.0.0_ga, smarc_8mm_imx_4.19.35_1.1.0, smarc_8mm_imx_5.4.24_2.1.0, smarc_8mp_lf-5.10.y, smarc_8mq_imx_5.4.24_2.1.0, smarc_8mq_lf-5.10.y, smarc_imx_lf-5.15.y

netxen:fix napi intr enable check 

o netif_running() check for enabling interrupt at end of napi poll is
  not enough to cover firmwar recovery. Instead test __NX_DEV_UP bit.
o Avoid re-entry into to netxen_nic_down() with __NX_DEV_UP bit check.

Acked-by: Dhananjay Phadke <dhananjay.phadke@qlogic.com>
Signed-off-by: Amit Kumar Salecha <amit.salecha@qlogic.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

Showing 1 changed file with 4 additions and 2 deletions Side-by-side Diff

drivers/net/netxen/netxen_nic_main.c
Diff comments   View file @ f2251f6
... ... @@ -1011,8 +1011,10 @@
1011 1011 if (adapter->is_up != NETXEN_ADAPTER_UP_MAGIC)
1012 1012 return;
1013 1013  
1014   - clear_bit(__NX_DEV_UP, &adapter->state);
  1014 + if (!test_and_clear_bit(__NX_DEV_UP, &adapter->state))
  1015 + return;
1015 1016  
  1017 + smp_mb();
1016 1018 spin_lock(&adapter->tx_clean_lock);
1017 1019 netif_carrier_off(netdev);
1018 1020 netif_tx_disable(netdev);
... ... @@ -2053,7 +2055,7 @@
2053 2055  
2054 2056 if ((work_done < budget) && tx_complete) {
2055 2057 napi_complete(&sds_ring->napi);
2056   - if (netif_running(adapter->netdev))
  2058 + if (test_bit(__NX_DEV_UP, &adapter->state))
2057 2059 netxen_nic_enable_int(sds_ring);
2058 2060 }
2059 2061