---

yaml
---
r: 134375
b: refs/heads/master
c: 8c63c46
h: refs/heads/master
i:
  134373: bc6b5b2
  134371: b93b41b
  134367: 57d4fd2
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4e30ffa29c1388006e5d36d5ea8c5b46b38b36d5
+refs/heads/master: 8c63c46d58c9dca6d0bfacfb41958c55d9b75ea0

trunk/drivers/net/wireless/ath9k/regd.c

@@ -158,8 +158,6 @@ const struct ieee80211_regdomain *ath9k_world_regdomain(struct ath_hal *ah)
 static void ath9k_reg_apply_5ghz_adhoc_flags(struct wiphy *wiphy,
 					     enum reg_set_by setby)
 {
-	struct ieee80211_hw *hw = wiphy_to_ieee80211_hw(wiphy);
-	struct ath_softc *sc = hw->priv;
 	struct ieee80211_supported_band *sband;
 	const struct ieee80211_reg_rule *reg_rule;
 	struct ieee80211_channel *ch;
@@ -169,8 +167,7 @@ static void ath9k_reg_apply_5ghz_adhoc_flags(struct wiphy *wiphy,
 
 	if (setby != REGDOM_SET_BY_COUNTRY_IE)
 		return;
-	if (!test_bit(ATH9K_MODE_11A,
-	    sc->sc_ah->ah_caps.wireless_modes))
+	if (!wiphy->bands[IEEE80211_BAND_5GHZ])
 		return;
 
 	sband = wiphy->bands[IEEE80211_BAND_5GHZ];