Merge mac80211-next into ath-next

Patch "ath10k: introduce basic tdls functionality" depends on this mac80211
patch:

c23e31cf7b mac80211: initialize rate control earlier for tdls station
This commit is contained in:
Kalle Valo
2015-03-30 10:07:12 +03:00
50 changed files with 1209 additions and 1042 deletions

View File

@@ -1632,7 +1632,8 @@ static void ath10k_peer_assoc_h_crypto(struct ath10k *ar,
lockdep_assert_held(&ar->conf_mutex);
bss = cfg80211_get_bss(ar->hw->wiphy, ar->hw->conf.chandef.chan,
info->bssid, NULL, 0, 0, 0);
info->bssid, NULL, 0, IEEE80211_BSS_TYPE_ANY,
IEEE80211_PRIVACY_ANY);
if (bss) {
const struct cfg80211_bss_ies *ies;