Gitiles
Code Review Sign In
git01.mediatek.com / openwrt / feeds / mtk-openwrt-feeds / 0415fc3ef723c49b2efca5456861bf7402f0ac83 / . / autobuild_mac80211_release / mt7988_mt7996_mac80211_mlo / package / kernel / mac80211 / patches / subsys / 0044-mtk-wifi-mac80211-add-wds-mlo-support.patch
blob: a82a203e578f992400ea13a676c098093ced386f [file] [log] [blame]
developer0415fc32024-04-19 18:29:00 +0800[diff] [blame^]1From 14fd30e05515edba0fcca8a7238d402cb2d9dd27 Mon Sep 17 00:00:00 2001
2From: Peter Chiu <chui-hao.chiu@mediatek.com>
3Date: Fri, 19 Jan 2024 15:22:00 +0800
4Subject: [PATCH 44/61] mtk: wifi: mac80211: add wds mlo support
5
6Support WDS mode when using MLO.
71. Remove use_4addr check.
82. Copy link information to AP_VLAN interface.
93. Fill 4addr nullfunc by mld address.
10
11CR-Id: WCNCR00240772
12Signed-off-by: Peter Chiu <chui-hao.chiu@mediatek.com>
13Change-Id: I620bb51e47965c2558751ae266609dad61d421b6
14---
15 net/mac80211/cfg.c | 7 -------
16 net/mac80211/iface.c | 19 +++++++++++--------
17 net/mac80211/mlme.c | 15 +++++++++------
18 3 files changed, 20 insertions(+), 21 deletions(-)
19
20diff --git a/net/mac80211/cfg.c b/net/mac80211/cfg.c
21index 3233e2a..0cb68fb 100644
22--- a/net/mac80211/cfg.c
23+++ b/net/mac80211/cfg.c
24@@ -229,10 +229,6 @@ static int ieee80211_change_iface(struct wiphy *wiphy,
25 if (params->use_4addr == ifmgd->use_4addr)
26 return 0;
27
28- /* FIXME: no support for 4-addr MLO yet */
29- if (ieee80211_vif_is_mld(&sdata->vif))
30- return -EOPNOTSUPP;
31-
32 sdata->u.mgd.use_4addr = params->use_4addr;
33 if (!ifmgd->associated)
34 return 0;
35@@ -4922,9 +4918,6 @@ static int ieee80211_add_intf_link(struct wiphy *wiphy,
36
37 lockdep_assert_wiphy(sdata->local->hw.wiphy);
38
39- if (wdev->use_4addr)
40- return -EOPNOTSUPP;
41-
42 return ieee80211_vif_set_links(sdata, wdev->valid_links, 0);
43 }
44
45diff --git a/net/mac80211/iface.c b/net/mac80211/iface.c
46index 0ae31a9..083da12 100644
47--- a/net/mac80211/iface.c
48+++ b/net/mac80211/iface.c
49@@ -381,19 +381,22 @@ static int ieee80211_check_concurrent_iface(struct ieee80211_sub_if_data *sdata,
50 nsdata->vif.type))
51 return -ENOTUNIQ;
52
53- /* No support for VLAN with MLO yet */
54- if (iftype == NL80211_IFTYPE_AP_VLAN &&
55- sdata->wdev.use_4addr &&
56- nsdata->vif.type == NL80211_IFTYPE_AP &&
57- nsdata->vif.valid_links)
58- return -EOPNOTSUPP;
59-
60 /*
61 * can only add VLANs to enabled APs
62 */
63 if (iftype == NL80211_IFTYPE_AP_VLAN &&
64- nsdata->vif.type == NL80211_IFTYPE_AP)
65+ nsdata->vif.type == NL80211_IFTYPE_AP) {
66+ int i;
67+
68 sdata->bss = &nsdata->u.ap;
69+ sdata->vif.valid_links = nsdata->vif.valid_links;
70+ sdata->vif.active_links = nsdata->vif.active_links;
71+ sdata->vif.dormant_links = nsdata->vif.dormant_links;
72+ for (i = 0; i < IEEE80211_MLD_MAX_NUM_LINKS; i++) {
73+ sdata->link[i] = nsdata->link[i];
74+ sdata->vif.link_conf[i] = nsdata->vif.link_conf[i];
75+ }
76+ }
77 }
78 }
79
80diff --git a/net/mac80211/mlme.c b/net/mac80211/mlme.c
81index 84ea805..674f3f5 100644
82--- a/net/mac80211/mlme.c
83+++ b/net/mac80211/mlme.c
84@@ -1829,6 +1829,7 @@ void ieee80211_send_4addr_nullfunc(struct ieee80211_local *local,
85 {
86 struct sk_buff *skb;
87 struct ieee80211_hdr *nullfunc;
88+ u8 assoc_link_id = ifmgd->assoc_data->assoc_link_id;
89 __le16 fc;
90
91 if (WARN_ON(sdata->vif.type != NL80211_IFTYPE_STATION))
92@@ -1844,11 +1845,17 @@ void ieee80211_send_4addr_nullfunc(struct ieee80211_local *local,
93 fc = cpu_to_le16(IEEE80211_FTYPE_DATA | IEEE80211_STYPE_NULLFUNC |
94 IEEE80211_FCTL_FROMDS | IEEE80211_FCTL_TODS);
95 nullfunc->frame_control = fc;
96- memcpy(nullfunc->addr1, sdata->deflink.u.mgd.bssid, ETH_ALEN);
97 memcpy(nullfunc->addr2, sdata->vif.addr, ETH_ALEN);
98- memcpy(nullfunc->addr3, sdata->deflink.u.mgd.bssid, ETH_ALEN);
99 memcpy(nullfunc->addr4, sdata->vif.addr, ETH_ALEN);
100
101+ if (ieee80211_vif_is_mld(&sdata->vif)) {
102+ memcpy(nullfunc->addr1, sdata->vif.cfg.ap_addr, ETH_ALEN);
103+ memcpy(nullfunc->addr3, sdata->vif.cfg.ap_addr, ETH_ALEN);
104+ } else {
105+ memcpy(nullfunc->addr1, sdata->deflink.u.mgd.bssid, ETH_ALEN);
106+ memcpy(nullfunc->addr3, sdata->deflink.u.mgd.bssid, ETH_ALEN);
107+ }
108+
109 IEEE80211_SKB_CB(skb)->flags |= IEEE80211_TX_INTFL_DONT_ENCRYPT;
110 IEEE80211_SKB_CB(skb)->flags |= IEEE80211_TX_CTL_USE_MINRATE;
111 ieee80211_tx_skb(sdata, skb);
112@@ -8229,10 +8236,6 @@ int ieee80211_mgd_assoc(struct ieee80211_sub_if_data *sdata,
113 for (i = 0; i < IEEE80211_MLD_MAX_NUM_LINKS; i++)
114 size += req->links[i].elems_len;
115
116- /* FIXME: no support for 4-addr MLO yet */
117- if (sdata->u.mgd.use_4addr && req->link_id >= 0)
118- return -EOPNOTSUPP;
119-
120 assoc_data = kzalloc(size, GFP_KERNEL);
121 if (!assoc_data)
122 return -ENOMEM;
123--
1242.39.2
125