aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/net/wireless/ath/ath9k/hw.c10
-rw-r--r--drivers/net/wireless/ath/ath9k/hw.h2
2 files changed, 6 insertions, 6 deletions
diff --git a/drivers/net/wireless/ath/ath9k/hw.c b/drivers/net/wireless/ath/ath9k/hw.c
index 917f70f7a28e..9474f9f6d400 100644
--- a/drivers/net/wireless/ath/ath9k/hw.c
+++ b/drivers/net/wireless/ath/ath9k/hw.c
@@ -368,7 +368,7 @@ static void ath9k_hw_init_config(struct ath_hw *ah)
368 ah->config.spurchans[i][1] = AR_NO_SPUR; 368 ah->config.spurchans[i][1] = AR_NO_SPUR;
369 } 369 }
370 370
371 ah->config.intr_mitigation = true; 371 ah->config.rx_intr_mitigation = true;
372 372
373 /* 373 /*
374 * We need this for PCI devices only (Cardbus, PCI, miniPCI) 374 * We need this for PCI devices only (Cardbus, PCI, miniPCI)
@@ -1160,7 +1160,7 @@ static void ath9k_hw_init_interrupt_masks(struct ath_hw *ah,
1160 AR_IMR_RXORN | 1160 AR_IMR_RXORN |
1161 AR_IMR_BCNMISC; 1161 AR_IMR_BCNMISC;
1162 1162
1163 if (ah->config.intr_mitigation) 1163 if (ah->config.rx_intr_mitigation)
1164 ah->mask_reg |= AR_IMR_RXINTM | AR_IMR_RXMINTR; 1164 ah->mask_reg |= AR_IMR_RXINTM | AR_IMR_RXMINTR;
1165 else 1165 else
1166 ah->mask_reg |= AR_IMR_RXOK; 1166 ah->mask_reg |= AR_IMR_RXOK;
@@ -2091,7 +2091,7 @@ int ath9k_hw_reset(struct ath_hw *ah, struct ath9k_channel *chan,
2091 2091
2092 REG_WRITE(ah, AR_OBS, 8); 2092 REG_WRITE(ah, AR_OBS, 8);
2093 2093
2094 if (ah->config.intr_mitigation) { 2094 if (ah->config.rx_intr_mitigation) {
2095 REG_RMW_FIELD(ah, AR_RIMT, AR_RIMT_LAST, 500); 2095 REG_RMW_FIELD(ah, AR_RIMT, AR_RIMT_LAST, 500);
2096 REG_RMW_FIELD(ah, AR_RIMT, AR_RIMT_FIRST, 2000); 2096 REG_RMW_FIELD(ah, AR_RIMT, AR_RIMT_FIRST, 2000);
2097 } 2097 }
@@ -2751,7 +2751,7 @@ bool ath9k_hw_getisr(struct ath_hw *ah, enum ath9k_int *masked)
2751 2751
2752 *masked = isr & ATH9K_INT_COMMON; 2752 *masked = isr & ATH9K_INT_COMMON;
2753 2753
2754 if (ah->config.intr_mitigation) { 2754 if (ah->config.rx_intr_mitigation) {
2755 if (isr & (AR_ISR_RXMINTR | AR_ISR_RXINTM)) 2755 if (isr & (AR_ISR_RXMINTR | AR_ISR_RXINTM))
2756 *masked |= ATH9K_INT_RX; 2756 *masked |= ATH9K_INT_RX;
2757 } 2757 }
@@ -2884,7 +2884,7 @@ enum ath9k_int ath9k_hw_set_interrupts(struct ath_hw *ah, enum ath9k_int ints)
2884 } 2884 }
2885 if (ints & ATH9K_INT_RX) { 2885 if (ints & ATH9K_INT_RX) {
2886 mask |= AR_IMR_RXERR; 2886 mask |= AR_IMR_RXERR;
2887 if (ah->config.intr_mitigation) 2887 if (ah->config.rx_intr_mitigation)
2888 mask |= AR_IMR_RXMINTR | AR_IMR_RXINTM; 2888 mask |= AR_IMR_RXMINTR | AR_IMR_RXINTM;
2889 else 2889 else
2890 mask |= AR_IMR_RXOK | AR_IMR_RXDESC; 2890 mask |= AR_IMR_RXOK | AR_IMR_RXDESC;
diff --git a/drivers/net/wireless/ath/ath9k/hw.h b/drivers/net/wireless/ath/ath9k/hw.h
index e2b0c73a616f..8849450dc591 100644
--- a/drivers/net/wireless/ath/ath9k/hw.h
+++ b/drivers/net/wireless/ath/ath9k/hw.h
@@ -212,7 +212,7 @@ struct ath9k_ops_config {
212 u32 cck_trig_low; 212 u32 cck_trig_low;
213 u32 enable_ani; 213 u32 enable_ani;
214 int serialize_regmode; 214 int serialize_regmode;
215 bool intr_mitigation; 215 bool rx_intr_mitigation;
216#define SPUR_DISABLE 0 216#define SPUR_DISABLE 0
217#define SPUR_ENABLE_IOCTL 1 217#define SPUR_ENABLE_IOCTL 1
218#define SPUR_ENABLE_EEPROM 2 218#define SPUR_ENABLE_EEPROM 2