#ifdef CONFIG_ATH_DEBUG
static ssize_t read_file_debug(struct file *file, char __user *user_buf,
-@@ -871,6 +885,40 @@ static const struct file_operations fops
+@@ -873,6 +887,40 @@ static const struct file_operations fops
.llseek = default_llseek,
};
int ath9k_init_debug(struct ath_hw *ah)
{
struct ath_common *common = ath9k_hw_common(ah);
-@@ -931,6 +979,11 @@ int ath9k_init_debug(struct ath_hw *ah)
+@@ -933,6 +981,11 @@ int ath9k_init_debug(struct ath_hw *ah)
goto err;
sc->debug.regidx = 0;
return 0;
err:
ath9k_exit_debug(ah);
-@@ -942,6 +995,7 @@ void ath9k_exit_debug(struct ath_hw *ah)
+@@ -944,6 +997,7 @@ void ath9k_exit_debug(struct ath_hw *ah)
struct ath_common *common = ath9k_hw_common(ah);
struct ath_softc *sc = (struct ath_softc *) common->priv;
static inline void ath9k_hw_set11n_txdesc(struct ath_hw *ah, void *ds,
--- a/drivers/net/wireless/ath/ath9k/hw.c
+++ b/drivers/net/wireless/ath/ath9k/hw.c
-@@ -2143,7 +2143,7 @@ void ath9k_hw_setrxfilter(struct ath_hw
+@@ -2139,7 +2139,7 @@ void ath9k_hw_setrxfilter(struct ath_hw
phybits |= AR_PHY_ERR_RADAR;
if (bits & ATH9K_RX_FILTER_PHYERR)
phybits |= AR_PHY_ERR_OFDM_TIMING | AR_PHY_ERR_CCK_TIMING;