diff options
| author | Tony Zelenoff <antonz@parallels.com> | 2012-04-13 06:09:51 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2012-04-15 12:56:02 -0400 |
| commit | aa45ba90b59b7a18b067b898a8cc8ccf8cbbb261 (patch) | |
| tree | dd77024474a8360036886a0202fd7439789f43c6 /drivers/net | |
| parent | 02d5d11bfa6d94676856c048a8471a4014368492 (diff) | |
| download | linux-aa45ba90b59b7a18b067b898a8cc8ccf8cbbb261.tar.bz2 | |
atl1: add value to check ability of reenabling IRQs
Unfortunately it is not clear from code is usage of
IMR register possible or not. So, to prevent possible
side-effects of reading this register i prefer store
interrupts enable flag separately.
Signed-off-by: Tony Zelenoff <antonz@parallels.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net')
| -rw-r--r-- | drivers/net/ethernet/atheros/atlx/atl1.h | 6 | ||||
| -rw-r--r-- | drivers/net/ethernet/atheros/atlx/atlx.c | 2 |
2 files changed, 8 insertions, 0 deletions
diff --git a/drivers/net/ethernet/atheros/atlx/atl1.h b/drivers/net/ethernet/atheros/atlx/atl1.h index 71bb50dfc5fa..117a0da360b8 100644 --- a/drivers/net/ethernet/atheros/atlx/atl1.h +++ b/drivers/net/ethernet/atheros/atlx/atl1.h @@ -783,6 +783,12 @@ struct atl1_adapter { u16 ict; /* interrupt clear timer (2us resolution */ struct mii_if_info mii; /* MII interface info */ + /* + * Use this value to check is napi handler allowed to + * enable ints or not + */ + bool int_enabled; + u32 bd_number; /* board number */ bool pci_using_64; struct atl1_hw hw; diff --git a/drivers/net/ethernet/atheros/atlx/atlx.c b/drivers/net/ethernet/atheros/atlx/atlx.c index ee83e1cc8b20..95975b5b7f70 100644 --- a/drivers/net/ethernet/atheros/atlx/atlx.c +++ b/drivers/net/ethernet/atheros/atlx/atlx.c @@ -169,6 +169,7 @@ static inline void atlx_imr_set(struct atlx_adapter *adapter, static void atlx_irq_enable(struct atlx_adapter *adapter) { atlx_imr_set(adapter, IMR_NORMAL_MASK); + adapter->int_enabled = true; } /* @@ -177,6 +178,7 @@ static void atlx_irq_enable(struct atlx_adapter *adapter) */ static void atlx_irq_disable(struct atlx_adapter *adapter) { + adapter->int_enabled = false; atlx_imr_set(adapter, 0); synchronize_irq(adapter->pdev->irq); } |