Commit 6e8912a5 authored by Shaul Triebitz's avatar Shaul Triebitz Committed by Johannes Berg
Browse files

wifi: mac80211: return a beacon for a specific link 



Pass the link id through to the get_beacon and return
the beacon for a specific link id.

Signed-off-by: default avatarShaul Triebitz <shaul.triebitz@intel.com>
Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
parent ae7ba17b

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

+1 −1
Original line number Diff line number Diff line
@@ -1630,7 +1630,7 @@ static int ath10k_mac_setup_bcn_tmpl(struct ath10k_vif *arvif) 
	    arvif->vdev_type != WMI_VDEV_TYPE_IBSS)

		return 0;



	bcn = ieee80211_beacon_get_template(hw, vif, &offs);

	bcn = ieee80211_beacon_get_template(hw, vif, &offs, 0);

	if (!bcn) {

		ath10k_warn(ar, "failed to get beacon template from mac80211\n");

		return -EPERM;

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

+1 −1
Original line number Diff line number Diff line
@@ -3888,7 +3888,7 @@ void ath10k_wmi_event_host_swba(struct ath10k *ar, struct sk_buff *skb) 
			continue;

		}



		bcn = ieee80211_beacon_get(ar->hw, arvif->vif);

		bcn = ieee80211_beacon_get(ar->hw, arvif->vif, 0);

		if (!bcn) {

			ath10k_warn(ar, "could not get mac80211 beacon\n");

			continue;

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

+1 −1
Original line number Diff line number Diff line
@@ -1362,7 +1362,7 @@ static int ath11k_mac_setup_bcn_tmpl(struct ath11k_vif *arvif) 
	if (arvif->vdev_type != WMI_VDEV_TYPE_AP)

		return 0;



	bcn = ieee80211_beacon_get_template(hw, vif, &offs);

	bcn = ieee80211_beacon_get_template(hw, vif, &offs, 0);

	if (!bcn) {

		ath11k_warn(ab, "failed to get beacon template from mac80211\n");

		return -EPERM;

drivers/net/wireless/ath/ath5k/base.c

+1 −1
Original line number Diff line number Diff line
@@ -1946,7 +1946,7 @@ ath5k_beacon_update(struct ieee80211_hw *hw, struct ieee80211_vif *vif) 
		goto out;

	}



	skb = ieee80211_beacon_get(hw, vif);

	skb = ieee80211_beacon_get(hw, vif, 0);



	if (!skb) {

		ret = -ENOMEM;

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

+1 −1
Original line number Diff line number Diff line
@@ -135,7 +135,7 @@ static struct ath_buf *ath9k_beacon_generate(struct ieee80211_hw *hw, 
		bf->bf_mpdu = NULL;

	}



	skb = ieee80211_beacon_get(hw, vif);

	skb = ieee80211_beacon_get(hw, vif, 0);

	if (skb == NULL)

		return NULL;