ath9k: fix some issues with ar934x rev 3 (especially ad-hoc mode)

[oweals/openwrt.git] / package / kernel / mac80211 / patches / 565-ath9k_restart_after_nfcal_failure.patch

diff --git a/package/kernel/mac80211/patches/565-ath9k_restart_after_nfcal_failure.patch b/package/kernel/mac80211/patches/565-ath9k_restart_after_nfcal_failure.patch
index 366cc3c7f515505df7e40b7bb15b58e77518a9d6..b53d50a75e099d37b6644bd4ff68910dd55d64f6 100644 (file)
--- a/package/kernel/mac80211/patches/565-ath9k_restart_after_nfcal_failure.patch
+++ b/package/kernel/mac80211/patches/565-ath9k_restart_after_nfcal_failure.patch
@@ -117,7 +117,7 @@
                ath9k_hw_start_nfcal(ah, false);
 --- a/drivers/net/wireless/ath/ath9k/hw.h
 +++ b/drivers/net/wireless/ath/ath9k/hw.h
-@@ -695,10 +695,8 @@ struct ath_hw_ops {
+@@ -696,10 +696,8 @@ struct ath_hw_ops {
                                     bool power_off);
        void (*rx_enable)(struct ath_hw *ah);
        void (*set_desc_link)(void *ds, u32 link);
@@ -142,7 +142,7 @@
  
 --- a/drivers/net/wireless/ath/ath9k/debug.c
 +++ b/drivers/net/wireless/ath/ath9k/debug.c
-@@ -857,6 +857,7 @@ static ssize_t read_file_reset(struct fi
+@@ -863,6 +863,7 @@ static ssize_t read_file_reset(struct fi
                [RESET_TYPE_MAC_HANG] = "MAC Hang",
                [RESET_TYPE_BEACON_STUCK] = "Stuck Beacon",
                [RESET_TYPE_MCI] = "MCI Reset",
@@ -152,7 +152,7 @@
        unsigned int len = 0;
 --- a/drivers/net/wireless/ath/ath9k/link.c
 +++ b/drivers/net/wireless/ath/ath9k/link.c
-@@ -376,9 +376,14 @@ void ath_ani_calibrate(unsigned long dat
+@@ -371,9 +371,14 @@ void ath_ani_calibrate(unsigned long dat
  
        /* Perform calibration if necessary */
        if (longcal || shortcal) {