Fresh pull from upstream

[librecmc/librecmc.git] / package / kernel / mac80211 / patches / 315-ath9k_hw-issue-external-reset-for-QCA955x.patch

diff --git a/package/kernel/mac80211/patches/315-ath9k_hw-issue-external-reset-for-QCA955x.patch b/package/kernel/mac80211/patches/315-ath9k_hw-issue-external-reset-for-QCA955x.patch
index 6a958a4132ddbdff4fc0de0a2fd52d34d68f913e..34d7d3b1cf9dae892c05c717941908d7dbeac919 100644 (file)
--- a/package/kernel/mac80211/patches/315-ath9k_hw-issue-external-reset-for-QCA955x.patch
+++ b/package/kernel/mac80211/patches/315-ath9k_hw-issue-external-reset-for-QCA955x.patch
@@ -91,7 +91,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
        return true;
  }
  
-@@ -1356,24 +1373,23 @@ static bool ath9k_hw_set_reset(struct at
+@@ -1356,24 +1373,24 @@ static bool ath9k_hw_set_reset(struct at
                        rst_flags |= AR_RTC_RC_MAC_COLD;
        }
  
@@ -115,7 +115,8 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
 -              REG_CLR_BIT(ah, AR_CFG, AR_CFG_HALT_REQ);
        }
  
-+      ath9k_hw_external_reset(ah, type);
++      if (!AR_SREV_9100(ah))
++              ath9k_hw_external_reset(ah, type);
 +
 +      if (AR_SREV_9300(ah) || AR_SREV_9580(ah))
 +              REG_CLR_BIT(ah, AR_CFG, AR_CFG_HALT_REQ);