From: Martin Kaistra <martin.kaistra@linutronix.de>
To: linux-wireless@vger.kernel.org
Cc: Jes Sorensen <Jes.Sorensen@gmail.com>,
Kalle Valo <kvalo@kernel.org>, Ping-Ke Shih <pkshih@realtek.com>,
Bitterblue Smith <rtl8821cerfe2@gmail.com>,
Sebastian Andrzej Siewior <bigeasy@linutronix.de>
Subject: [PATCH v2 10/18] wifi: rtl8xxxu: Add sta_add() and sta_remove() callbacks
Date: Wed, 19 Apr 2023 12:01:37 +0200 [thread overview]
Message-ID: <20230419100145.159191-11-martin.kaistra@linutronix.de> (raw)
In-Reply-To: <20230419100145.159191-1-martin.kaistra@linutronix.de>
In AP mode, sta_add() gets called when a new STA gets associated to
us. Call rtl8xxxu_refresh_rate_mask() to set a rate mask for the newly
connected STA (referenced by the macid) and then send a media connnect
report. Ignore the call to sta_add() in station mode.
Reserve one macid for broadcast/multicast packets in init.
Signed-off-by: Martin Kaistra <martin.kaistra@linutronix.de>
---
.../net/wireless/realtek/rtl8xxxu/rtl8xxxu.h | 9 ++++
.../wireless/realtek/rtl8xxxu/rtl8xxxu_core.c | 52 +++++++++++++++++++
2 files changed, 61 insertions(+)
diff --git a/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu.h b/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu.h
index 93091068b3fd2..fb8ba97566c23 100644
--- a/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu.h
+++ b/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu.h
@@ -1730,6 +1730,7 @@ struct rtl8xxxu_cfo_tracking {
};
#define RTL8XXXU_HW_LED_CONTROL 2
+#define RTL8XXXU_MAX_MAC_ID_NUM 128
#define RTL8XXXU_BC_MC_MACID 0
struct rtl8xxxu_priv {
@@ -1865,6 +1866,14 @@ struct rtl8xxxu_priv {
bool led_registered;
char led_name[32];
struct led_classdev led_cdev;
+ DECLARE_BITMAP(mac_id_map, RTL8XXXU_MAX_MAC_ID_NUM);
+};
+
+struct rtl8xxxu_sta_info {
+ struct ieee80211_sta *sta;
+ struct ieee80211_vif *vif;
+
+ u8 macid;
};
struct rtl8xxxu_rx_urb {
diff --git a/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c b/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c
index 19e115d10493a..d0c7d3a191f1a 100644
--- a/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c
+++ b/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c
@@ -3902,6 +3902,22 @@ void rtl8xxxu_init_burst(struct rtl8xxxu_priv *priv)
rtl8xxxu_write8(priv, REG_RSV_CTRL, val8);
}
+static u8 rtl8xxxu_acquire_macid(struct rtl8xxxu_priv *priv)
+{
+ u8 macid;
+
+ macid = find_first_zero_bit(priv->mac_id_map, RTL8XXXU_MAX_MAC_ID_NUM);
+ if (macid < RTL8XXXU_MAX_MAC_ID_NUM)
+ set_bit(macid, priv->mac_id_map);
+
+ return macid;
+}
+
+static void rtl8xxxu_release_macid(struct rtl8xxxu_priv *priv, u8 macid)
+{
+ clear_bit(macid, priv->mac_id_map);
+}
+
static int rtl8xxxu_init_device(struct ieee80211_hw *hw)
{
struct rtl8xxxu_priv *priv = hw->priv;
@@ -4371,6 +4387,8 @@ static int rtl8xxxu_init_device(struct ieee80211_hw *hw)
if (priv->rtl_chip == RTL8188E)
rtl8188e_ra_info_init_all(&priv->ra_info);
+ set_bit(RTL8XXXU_BC_MC_MACID, priv->mac_id_map);
+
exit:
return ret;
}
@@ -7144,6 +7162,38 @@ static void rtl8xxxu_stop(struct ieee80211_hw *hw)
rtl8xxxu_free_tx_resources(priv);
}
+static int rtl8xxxu_sta_add(struct ieee80211_hw *hw,
+ struct ieee80211_vif *vif,
+ struct ieee80211_sta *sta)
+{
+ struct rtl8xxxu_sta_info *sta_info = (struct rtl8xxxu_sta_info *)sta->drv_priv;
+ struct rtl8xxxu_priv *priv = hw->priv;
+
+ if (vif->type == NL80211_IFTYPE_AP) {
+ sta_info->macid = rtl8xxxu_acquire_macid(priv);
+ if (sta_info->macid >= RTL8XXXU_MAX_MAC_ID_NUM)
+ return -ENOSPC;
+
+ rtl8xxxu_refresh_rate_mask(priv, 0, sta, true);
+ priv->fops->report_connect(priv, sta_info->macid, H2C_MACID_ROLE_STA, true);
+ }
+
+ return 0;
+}
+
+static int rtl8xxxu_sta_remove(struct ieee80211_hw *hw,
+ struct ieee80211_vif *vif,
+ struct ieee80211_sta *sta)
+{
+ struct rtl8xxxu_sta_info *sta_info = (struct rtl8xxxu_sta_info *)sta->drv_priv;
+ struct rtl8xxxu_priv *priv = hw->priv;
+
+ if (vif->type == NL80211_IFTYPE_AP)
+ rtl8xxxu_release_macid(priv, sta_info->macid);
+
+ return 0;
+}
+
static const struct ieee80211_ops rtl8xxxu_ops = {
.tx = rtl8xxxu_tx,
.wake_tx_queue = ieee80211_handle_wake_tx_queue,
@@ -7164,6 +7214,8 @@ static const struct ieee80211_ops rtl8xxxu_ops = {
.sta_statistics = rtl8xxxu_sta_statistics,
.get_antenna = rtl8xxxu_get_antenna,
.set_tim = rtl8xxxu_set_tim,
+ .sta_add = rtl8xxxu_sta_add,
+ .sta_remove = rtl8xxxu_sta_remove,
};
static int rtl8xxxu_parse_usb(struct rtl8xxxu_priv *priv,
--
2.30.2
next prev parent reply other threads:[~2023-04-19 10:02 UTC|newest]
Thread overview: 36+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-04-19 10:01 [PATCH v2 00/18] wifi: rtl8xxxu: Add AP mode support for 8188f Martin Kaistra
2023-04-19 10:01 ` [PATCH v2 01/18] wifi: rtl8xxxu: Add start_ap() callback Martin Kaistra
2023-04-19 10:01 ` [PATCH v2 02/18] wifi: rtl8xxxu: Select correct queue for beacon frames Martin Kaistra
2023-04-19 10:01 ` [PATCH v2 03/18] wifi: rtl8xxxu: Add beacon functions Martin Kaistra
2023-04-24 2:29 ` Ping-Ke Shih
2023-04-24 9:17 ` Martin Kaistra
2023-04-19 10:01 ` [PATCH v2 04/18] wifi: rtl8xxxu: Add set_tim() callback Martin Kaistra
2023-04-19 10:01 ` [PATCH v2 05/18] wifi: rtl8xxxu: Allow setting rts threshold to -1 Martin Kaistra
2023-04-19 10:01 ` [PATCH v2 06/18] wifi: rtl8xxxu: Allow creating interface in AP mode Martin Kaistra
2023-04-24 2:32 ` Ping-Ke Shih
2023-04-19 10:01 ` [PATCH v2 07/18] wifi: rtl8xxxu: Actually use macid in rtl8xxxu_gen2_report_connect Martin Kaistra
2023-04-19 10:01 ` [PATCH v2 08/18] wifi: rtl8xxxu: Add parameter role to report_connect Martin Kaistra
2023-04-24 2:40 ` Ping-Ke Shih
2023-04-19 10:01 ` [PATCH v2 09/18] wifi: rtl8xxxu: Add parameter force to rtl8xxxu_refresh_rate_mask Martin Kaistra
2023-04-24 2:42 ` Ping-Ke Shih
2023-04-19 10:01 ` Martin Kaistra [this message]
2023-04-24 2:46 ` [PATCH v2 10/18] wifi: rtl8xxxu: Add sta_add() and sta_remove() callbacks Ping-Ke Shih
2023-04-19 10:01 ` [PATCH v2 11/18] wifi: rtl8xxxu: Put the macid in txdesc Martin Kaistra
2023-04-24 3:00 ` Ping-Ke Shih
2023-04-19 10:01 ` [PATCH v2 12/18] wifi: rtl8xxxu: Add parameter macid to update_rate_mask Martin Kaistra
2023-04-24 3:01 ` Ping-Ke Shih
2023-04-19 10:01 ` [PATCH v2 13/18] wifi: rtl8xxxu: Enable hw seq for mgmt/non-QoS data frames Martin Kaistra
2023-04-24 3:04 ` Ping-Ke Shih
2023-04-19 10:01 ` [PATCH v2 14/18] wifi: rtl8xxxu: Clean up filter configuration Martin Kaistra
2023-04-24 3:05 ` Ping-Ke Shih
2023-04-19 10:01 ` [PATCH v2 15/18] wifi: rtl8xxxu: Remove usage of ieee80211_get_tx_rate() Martin Kaistra
2023-04-24 3:07 ` Ping-Ke Shih
2023-04-19 10:01 ` [PATCH v2 16/18] wifi: rtl8xxxu: Remove usage of tx_info->control.rates[0].flags Martin Kaistra
2023-04-24 3:10 ` Ping-Ke Shih
2023-04-19 10:01 ` [PATCH v2 17/18] wifi: rtl8xxxu: Declare AP mode support for 8188f Martin Kaistra
2023-04-19 10:01 ` [PATCH v2 18/18] wifi: rtl8xxxu: Set maximum number of supported stations Martin Kaistra
2023-04-24 3:12 ` Ping-Ke Shih
2023-04-24 20:16 ` Bitterblue Smith
2023-04-25 5:53 ` Kalle Valo
2023-04-19 20:35 ` [PATCH v2 00/18] wifi: rtl8xxxu: Add AP mode support for 8188f Bitterblue Smith
2023-04-20 7:44 ` Martin Kaistra
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230419100145.159191-11-martin.kaistra@linutronix.de \
--to=martin.kaistra@linutronix.de \
--cc=Jes.Sorensen@gmail.com \
--cc=bigeasy@linutronix.de \
--cc=kvalo@kernel.org \
--cc=linux-wireless@vger.kernel.org \
--cc=pkshih@realtek.com \
--cc=rtl8821cerfe2@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).