From: Ben Greear <greearb@xxxxxxxxxxxxxxx>
The station kickout threshold is a pdev value, not per vdev,
so it should be set all the time, not just when vdev is an
AP. This should fix setting the station kickout threshold
when using ibss interfaces.
Signed-off-by: Ben Greear <greearb@xxxxxxxxxxxxxxx>
---
drivers/net/wireless/ath/ath10k/mac.c | 27 ++++++++++++++++++---------
drivers/net/wireless/ath/ath10k/mac.h | 2 ++
2 files changed, 20 insertions(+), 9 deletions(-)
diff --git a/drivers/net/wireless/ath/ath10k/mac.c b/drivers/net/wireless/ath/ath10k/mac.c
index 39fcdad..4aa0736 100644
--- a/drivers/net/wireless/ath/ath10k/mac.c
+++ b/drivers/net/wireless/ath/ath10k/mac.c
@@ -744,21 +744,26 @@ static int ath10k_peer_create(struct ath10k *ar,
return 0;
}
+int ath10k_mac_set_pdev_kickout(struct ath10k *ar)
+{
+ u32 param = ar->wmi.pdev_param->sta_kickout_th;
+ int rv;
+
+ rv = ath10k_wmi_pdev_set_param(ar, param,
+ ar->sta_xretry_kickout_thresh);
+ if (rv) {
+ ath10k_warn(ar, "failed to set sta kickout threshold to %d: %d\n",
+ ar->sta_xretry_kickout_thresh, rv);
+ }
+ return rv;
+}
+
static int ath10k_mac_set_kickout(struct ath10k_vif *arvif)
{
struct ath10k *ar = arvif->ar;
u32 param;
int ret;
- param = ar->wmi.pdev_param->sta_kickout_th;
- ret = ath10k_wmi_pdev_set_param(ar, param,
- ar->sta_xretry_kickout_thresh);
- if (ret) {
- ath10k_warn(ar, "failed to set kickout threshold on vdev %i: %d\n",
- arvif->vdev_id, ret);
- return ret;
- }
-
param = ar->wmi.vdev_param->ap_keepalive_min_idle_inactive_time_secs;
ret = ath10k_wmi_vdev_set_param(ar, arvif->vdev_id, param,
ATH10K_KEEPALIVE_MIN_IDLE);
@@ -5427,6 +5432,10 @@ static int ath10k_add_interface(struct ieee80211_hw *hw,
arvif->peer_id = HTT_INVALID_PEERID;
}
+ ret = ath10k_mac_set_pdev_kickout(ar);
+ if (ret)
+ return ret;
+
if (arvif->vdev_type == WMI_VDEV_TYPE_AP) {
ret = ath10k_mac_set_kickout(arvif);
if (ret) {
diff --git a/drivers/net/wireless/ath/ath10k/mac.h b/drivers/net/wireless/ath/ath10k/mac.h
index 5f027ec..1a34cab 100644
--- a/drivers/net/wireless/ath/ath10k/mac.h
+++ b/drivers/net/wireless/ath/ath10k/mac.h
@@ -113,4 +113,6 @@ static inline void ath10k_tx_h_seq_no(struct ieee80211_vif *vif,
}
}
+int ath10k_mac_set_pdev_kickout(struct ath10k *ar);
+
#endif /* _MAC_H_ */
--
2.4.11
