Michal Kazior <michal.kazior@xxxxxxxxx> writes:
> The chanctx API will allow ath10k to support
> multi-channel operation.
>
> Signed-off-by: Michal Kazior <michal.kazior@xxxxxxxxx>
[...]
> @@ -1754,13 +1945,19 @@ static void ath10k_peer_assoc_h_crypto(struct ath10k *ar,
> struct wmi_peer_assoc_complete_arg *arg)
> {
> struct ieee80211_bss_conf *info = &vif->bss_conf;
> + struct ath10k_vif *arvif = ath10k_vif_to_arvif(vif);
> + struct ath10k_chanctx *arctx;
> struct cfg80211_bss *bss;
> const u8 *rsnie = NULL;
> const u8 *wpaie = NULL;
>
> lockdep_assert_held(&ar->conf_mutex);
>
> - bss = cfg80211_get_bss(ar->hw->wiphy, ar->hw->conf.chandef.chan,
> + arctx = ath10k_mac_vif_ctx(arvif);
> + if (WARN_ON(!arctx))
> + return;
> +
> + bss = cfg80211_get_bss(ar->hw->wiphy, arctx->conf.def.chan,
> info->bssid, NULL, 0, 0, 0);
As I had to pull mac80211-next for TDLS there was a conflict here.
Please check the pending branch for my conflict resolution.
--
Kalle Valo
--
To unsubscribe from this list: send the line "unsubscribe linux-wireless" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
