Commit ae9a138f authored by David S. Miller's avatar David S. Miller
Browse files

Merge tag 'mac80211-next-for-davem-2020-08-28' of... 

Merge tag 'mac80211-next-for-davem-2020-08-28' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next



Johannes Berg says:

====================
This time we have:
 * some code to support SAE (WPA3) offload in AP mode
 * many documentation (wording) fixes/updates
 * netlink policy updates, including the use of NLA_RANGE
   with binary attributes
 * regulatory improvements for adjacent frequency bands
 * and a few other small additions/refactorings/cleanups
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 50aba46c 2831a631

drivers/net/wireless/ath/ath10k/mac.c

+2 −2
Original line number Diff line number Diff line
@@ -2019,8 +2019,8 @@ static void ath10k_mac_vif_ap_csa_count_down(struct ath10k_vif *arvif) 
	if (!arvif->is_up)

		return;



	if (!ieee80211_csa_is_complete(vif)) {

		ieee80211_csa_update_counter(vif);

	if (!ieee80211_beacon_cntdwn_is_complete(vif)) {

		ieee80211_beacon_update_cntdwn(vif);



		ret = ath10k_mac_setup_bcn_tmpl(arvif);

		if (ret)

drivers/net/wireless/ath/ath10k/wmi.c

+1 −1
Original line number Diff line number Diff line
@@ -3878,7 +3878,7 @@ void ath10k_wmi_event_host_swba(struct ath10k *ar, struct sk_buff *skb) 
		 * actual channel switch is done

		 */

		if (arvif->vif->csa_active &&

		    ieee80211_csa_is_complete(arvif->vif)) {

		    ieee80211_beacon_cntdwn_is_complete(arvif->vif)) {

			ieee80211_csa_finish(arvif->vif);

			continue;

		}

drivers/net/wireless/ath/ath11k/wmi.c

+2 −2
Original line number Diff line number Diff line
@@ -1593,8 +1593,8 @@ int ath11k_wmi_bcn_tmpl(struct ath11k *ar, u32 vdev_id, 
			  FIELD_PREP(WMI_TLV_LEN, sizeof(*cmd) - TLV_HDR_SIZE);

	cmd->vdev_id = vdev_id;

	cmd->tim_ie_offset = offs->tim_offset;

	cmd->csa_switch_count_offset = offs->csa_counter_offs[0];

	cmd->ext_csa_switch_count_offset = offs->csa_counter_offs[1];

	cmd->csa_switch_count_offset = offs->cntdwn_counter_offs[0];

	cmd->ext_csa_switch_count_offset = offs->cntdwn_counter_offs[1];

	cmd->buf_len = bcn->len;



	ptr = skb->data + sizeof(*cmd);

drivers/net/wireless/ath/ath9k/beacon.c

+1 −1
Original line number Diff line number Diff line
@@ -365,7 +365,7 @@ bool ath9k_csa_is_finished(struct ath_softc *sc, struct ieee80211_vif *vif) 
	if (!vif || !vif->csa_active)

		return false;



	if (!ieee80211_csa_is_complete(vif))

	if (!ieee80211_beacon_cntdwn_is_complete(vif))

		return false;



	ieee80211_csa_finish(vif);

drivers/net/wireless/ath/ath9k/htc_drv_beacon.c

+1 −1
Original line number Diff line number Diff line
@@ -514,7 +514,7 @@ bool ath9k_htc_csa_is_finished(struct ath9k_htc_priv *priv) 
	if (!vif || !vif->csa_active)

		return false;



	if (!ieee80211_csa_is_complete(vif))

	if (!ieee80211_beacon_cntdwn_is_complete(vif))

		return false;



	ieee80211_csa_finish(vif);