Merge remote-tracking branch 'wireless-next/master' into mac80211-next

diff --cc drivers/net/wireless/ath/ath6kl/cfg80211.c
index b8fce0d4d72e3bcd8401bfbcbfd602617ec65814,fd7dbd4609df3c6da9595a7bf5239cd7932d57fd..aca1d2689e907fce2d5a9841e5acfad515c3ee50
--- 1/drivers/net/wireless/ath/ath6kl/cfg80211.c
--- 2/drivers/net/wireless/ath/ath6kl/cfg80211.c
+++ b/drivers/net/wireless/ath/ath6kl/cfg80211.c
@@@ -3497,9 -3636,8 +3637,9 @@@ int ath6kl_cfg80211_init(struct ath6kl 
        wiphy->wowlan.n_patterns = WOW_MAX_FILTERS_PER_LIST;
        wiphy->wowlan.pattern_min_len = 1;
        wiphy->wowlan.pattern_max_len = WOW_PATTERN_SIZE;
 +#endif
  
-       wiphy->max_sched_scan_ssids = MAX_PROBED_SSID_INDEX;
+       wiphy->max_sched_scan_ssids = MAX_PROBED_SSIDS;
  
        ar->wiphy->flags |= WIPHY_FLAG_SUPPORTS_FW_ROAM |
                            WIPHY_FLAG_HAVE_AP_SME |

diff --cc drivers/net/wireless/ti/wlcore/main.c
Simple merge

diff --cc include/net/mac80211.h
Simple merge

diff --cc net/mac80211/cfg.c
Simple merge

diff --cc net/mac80211/mlme.c
Simple merge