Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit bb8f0c6a authored by Michal Kazior's avatar Michal Kazior Committed by Kalle Valo
Browse files

ath10k: maintain peer_id for each sta and vif 



The 10.4.3 firmware with congestion control
guarantees that each peer has only a single
peer_id mapping.

The 1:1 mapping isn't the case for older firmwares
(e.g. 10.4.1, 10.2, 10.1) but it should not
matter. This 1:1 mapping is going to be only used
by future code which inherently (flow-wise) is for
10.4.3.

Signed-off-by: default avatarMichal Kazior <michal.kazior@tieto.com>
Signed-off-by: default avatarKalle Valo <kvalo@qca.qualcomm.com>
parent 6421969f

drivers/net/wireless/ath/ath10k/core.h

+2 −0
Original line number Original line Diff line number Diff line
@@ -313,6 +313,7 @@ struct ath10k_sta { 
	u32 bw;

	u32 bw;

	u32 nss;

	u32 nss;

	u32 smps;

	u32 smps;

	u16 peer_id;





	struct work_struct update_wk;

	struct work_struct update_wk;
@@ -335,6 +336,7 @@ struct ath10k_vif { 
	struct list_head list;

	struct list_head list;





	u32 vdev_id;

	u32 vdev_id;

	u16 peer_id;

	enum wmi_vdev_type vdev_type;

	enum wmi_vdev_type vdev_type;

	enum wmi_vdev_subtype vdev_subtype;

	enum wmi_vdev_subtype vdev_subtype;

	u32 beacon_interval;

	u32 beacon_interval;

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

+38 −0
Original line number Original line Diff line number Diff line
@@ -4421,6 +4421,7 @@ static int ath10k_add_interface(struct ieee80211_hw *hw, 
{

{

	struct ath10k *ar = hw->priv;

	struct ath10k *ar = hw->priv;

	struct ath10k_vif *arvif = ath10k_vif_to_arvif(vif);

	struct ath10k_vif *arvif = ath10k_vif_to_arvif(vif);

	struct ath10k_peer *peer;

	enum wmi_sta_powersave_param param;

	enum wmi_sta_powersave_param param;

	int ret = 0;

	int ret = 0;

	u32 value;

	u32 value;
@@ -4620,6 +4621,24 @@ static int ath10k_add_interface(struct ieee80211_hw *hw, 
				    arvif->vdev_id, ret);

				    arvif->vdev_id, ret);

			goto err_vdev_delete;

			goto err_vdev_delete;

		}

		}



		spin_lock_bh(&ar->data_lock);



		peer = ath10k_peer_find(ar, arvif->vdev_id, vif->addr);

		if (!peer) {

			ath10k_warn(ar, "failed to lookup peer %pM on vdev %i\n",

				    vif->addr, arvif->vdev_id);

			spin_unlock_bh(&ar->data_lock);

			ret = -ENOENT;

			goto err_peer_delete;

		}



		arvif->peer_id = find_first_bit(peer->peer_ids,

						ATH10K_MAX_NUM_PEER_IDS);



		spin_unlock_bh(&ar->data_lock);

	} else {

		arvif->peer_id = HTT_INVALID_PEERID;

	}

	}





	if (arvif->vdev_type == WMI_VDEV_TYPE_AP) {

	if (arvif->vdev_type == WMI_VDEV_TYPE_AP) {
@@ -5501,6 +5520,7 @@ static int ath10k_sta_state(struct ieee80211_hw *hw, 
	struct ath10k *ar = hw->priv;

	struct ath10k *ar = hw->priv;

	struct ath10k_vif *arvif = ath10k_vif_to_arvif(vif);

	struct ath10k_vif *arvif = ath10k_vif_to_arvif(vif);

	struct ath10k_sta *arsta = (struct ath10k_sta *)sta->drv_priv;

	struct ath10k_sta *arsta = (struct ath10k_sta *)sta->drv_priv;

	struct ath10k_peer *peer;

	int ret = 0;

	int ret = 0;





	if (old_state == IEEE80211_STA_NOTEXIST &&

	if (old_state == IEEE80211_STA_NOTEXIST &&
@@ -5551,6 +5571,24 @@ static int ath10k_sta_state(struct ieee80211_hw *hw, 
			goto exit;

			goto exit;

		}

		}





		spin_lock_bh(&ar->data_lock);



		peer = ath10k_peer_find(ar, arvif->vdev_id, sta->addr);

		if (!peer) {

			ath10k_warn(ar, "failed to lookup peer %pM on vdev %i\n",

				    vif->addr, arvif->vdev_id);

			spin_unlock_bh(&ar->data_lock);

			ath10k_peer_delete(ar, arvif->vdev_id, sta->addr);

			ath10k_mac_dec_num_stations(arvif, sta);

			ret = -ENOENT;

			goto exit;

		}



		arsta->peer_id = find_first_bit(peer->peer_ids,

						ATH10K_MAX_NUM_PEER_IDS);



		spin_unlock_bh(&ar->data_lock);



		if (!sta->tdls)

		if (!sta->tdls)

			goto exit;

			goto exit;