]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
wifi: mac80211: refactor block ack management code
authorDmitry Antipov <dmantipov@yandex.ru>
Thu, 25 Jul 2024 09:09:25 +0000 (12:09 +0300)
committerJohannes Berg <johannes.berg@intel.com>
Tue, 27 Aug 2024 08:12:50 +0000 (10:12 +0200)
Introduce 'ieee80211_mgmt_ba()' to avoid code duplication between
'ieee80211_send_addba_resp()', 'ieee80211_send_addba_request()',
and 'ieee80211_send_delba()', ensure that all related addresses
are '__aligned(2)', and prefer convenient 'ether_addr_copy()'
over generic 'memcpy()'. No functional changes expected.

Signed-off-by: Dmitry Antipov <dmantipov@yandex.ru>
Link: https://patch.msgid.link/20240725090925.6022-1-dmantipov@yandex.ru
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
include/net/mac80211.h
net/mac80211/agg-rx.c
net/mac80211/agg-tx.c
net/mac80211/ht.c
net/mac80211/ieee80211_i.h

index 0a04eaf5343c64730b0909071b9e55c2248a6e31..9406f687cffb7e3d142083afa96f5f06f708dde9 100644 (file)
@@ -2487,7 +2487,7 @@ struct ieee80211_link_sta {
  * @spp_amsdu: indicates whether the STA uses SPP A-MSDU or not.
  */
 struct ieee80211_sta {
-       u8 addr[ETH_ALEN];
+       u8 addr[ETH_ALEN] __aligned(2);
        u16 aid;
        u16 max_rx_aggregation_subframes;
        bool wme;
index 9bffac7a4974d156f9525d76005f983f0f49c6be..fe7eab4b681b013187c76fdddc5ad6279cef5c00 100644 (file)
@@ -207,20 +207,7 @@ static void ieee80211_send_addba_resp(struct sta_info *sta, u8 *da, u16 tid,
                return;
 
        skb_reserve(skb, local->hw.extra_tx_headroom);
-       mgmt = skb_put_zero(skb, 24);
-       memcpy(mgmt->da, da, ETH_ALEN);
-       memcpy(mgmt->sa, sdata->vif.addr, ETH_ALEN);
-       if (sdata->vif.type == NL80211_IFTYPE_AP ||
-           sdata->vif.type == NL80211_IFTYPE_AP_VLAN ||
-           sdata->vif.type == NL80211_IFTYPE_MESH_POINT)
-               memcpy(mgmt->bssid, sdata->vif.addr, ETH_ALEN);
-       else if (sdata->vif.type == NL80211_IFTYPE_STATION)
-               memcpy(mgmt->bssid, sdata->vif.cfg.ap_addr, ETH_ALEN);
-       else if (sdata->vif.type == NL80211_IFTYPE_ADHOC)
-               memcpy(mgmt->bssid, sdata->u.ibss.bssid, ETH_ALEN);
-
-       mgmt->frame_control = cpu_to_le16(IEEE80211_FTYPE_MGMT |
-                                         IEEE80211_STYPE_ACTION);
+       mgmt = ieee80211_mgmt_ba(skb, da, sdata);
 
        skb_put(skb, 1 + sizeof(mgmt->u.action.u.addba_resp));
        mgmt->u.action.category = WLAN_CATEGORY_BACK;
index 677bbbac9f169f0e86ea34391cd8d9b6837e25a5..1c18b862ef8c7656726c8f8c9b8134a690cadd16 100644 (file)
@@ -74,20 +74,7 @@ static void ieee80211_send_addba_request(struct ieee80211_sub_if_data *sdata,
                return;
 
        skb_reserve(skb, local->hw.extra_tx_headroom);
-       mgmt = skb_put_zero(skb, 24);
-       memcpy(mgmt->da, da, ETH_ALEN);
-       memcpy(mgmt->sa, sdata->vif.addr, ETH_ALEN);
-       if (sdata->vif.type == NL80211_IFTYPE_AP ||
-           sdata->vif.type == NL80211_IFTYPE_AP_VLAN ||
-           sdata->vif.type == NL80211_IFTYPE_MESH_POINT)
-               memcpy(mgmt->bssid, sdata->vif.addr, ETH_ALEN);
-       else if (sdata->vif.type == NL80211_IFTYPE_STATION)
-               memcpy(mgmt->bssid, sdata->vif.cfg.ap_addr, ETH_ALEN);
-       else if (sdata->vif.type == NL80211_IFTYPE_ADHOC)
-               memcpy(mgmt->bssid, sdata->u.ibss.bssid, ETH_ALEN);
-
-       mgmt->frame_control = cpu_to_le16(IEEE80211_FTYPE_MGMT |
-                                         IEEE80211_STYPE_ACTION);
+       mgmt = ieee80211_mgmt_ba(skb, da, sdata);
 
        skb_put(skb, 1 + sizeof(mgmt->u.action.u.addba_req));
 
index 79caeb485fd5d38df4b41f4cbecc873e4861dbf0..1c2b7dd8976aa13d12bf12a0670713962f164453 100644 (file)
@@ -467,20 +467,7 @@ void ieee80211_send_delba(struct ieee80211_sub_if_data *sdata,
                return;
 
        skb_reserve(skb, local->hw.extra_tx_headroom);
-       mgmt = skb_put_zero(skb, 24);
-       memcpy(mgmt->da, da, ETH_ALEN);
-       memcpy(mgmt->sa, sdata->vif.addr, ETH_ALEN);
-       if (sdata->vif.type == NL80211_IFTYPE_AP ||
-           sdata->vif.type == NL80211_IFTYPE_AP_VLAN ||
-           sdata->vif.type == NL80211_IFTYPE_MESH_POINT)
-               memcpy(mgmt->bssid, sdata->vif.addr, ETH_ALEN);
-       else if (sdata->vif.type == NL80211_IFTYPE_STATION)
-               memcpy(mgmt->bssid, sdata->vif.cfg.ap_addr, ETH_ALEN);
-       else if (sdata->vif.type == NL80211_IFTYPE_ADHOC)
-               memcpy(mgmt->bssid, sdata->u.ibss.bssid, ETH_ALEN);
-
-       mgmt->frame_control = cpu_to_le16(IEEE80211_FTYPE_MGMT |
-                                         IEEE80211_STYPE_ACTION);
+       mgmt = ieee80211_mgmt_ba(skb, da, sdata);
 
        skb_put(skb, 1 + sizeof(mgmt->u.action.u.delba));
 
index a3485e4c6132ffaedb0a7ca799addd7fa0a216fb..fdd2bad15076db1d18ebebbdc52f6c5f60176990 100644 (file)
@@ -2136,6 +2136,29 @@ void ieee80211_process_addba_request(struct ieee80211_local *local,
                                     struct ieee80211_mgmt *mgmt,
                                     size_t len);
 
+static inline struct ieee80211_mgmt *
+ieee80211_mgmt_ba(struct sk_buff *skb, const u8 *da,
+                 struct ieee80211_sub_if_data *sdata)
+{
+       struct ieee80211_mgmt *mgmt = skb_put_zero(skb, 24);
+
+       ether_addr_copy(mgmt->da, da);
+       ether_addr_copy(mgmt->sa, sdata->vif.addr);
+
+       if (sdata->vif.type == NL80211_IFTYPE_AP ||
+           sdata->vif.type == NL80211_IFTYPE_AP_VLAN ||
+           sdata->vif.type == NL80211_IFTYPE_MESH_POINT)
+               ether_addr_copy(mgmt->bssid, sdata->vif.addr);
+       else if (sdata->vif.type == NL80211_IFTYPE_STATION)
+               ether_addr_copy(mgmt->bssid, sdata->vif.cfg.ap_addr);
+       else if (sdata->vif.type == NL80211_IFTYPE_ADHOC)
+               ether_addr_copy(mgmt->bssid, sdata->u.ibss.bssid);
+
+       mgmt->frame_control = cpu_to_le16(IEEE80211_FTYPE_MGMT |
+                                         IEEE80211_STYPE_ACTION);
+       return mgmt;
+}
+
 int __ieee80211_stop_tx_ba_session(struct sta_info *sta, u16 tid,
                                   enum ieee80211_agg_stop_reason reason);
 void ieee80211_start_tx_ba_cb(struct sta_info *sta, int tid,