| From 14fd30e05515edba0fcca8a7238d402cb2d9dd27 Mon Sep 17 00:00:00 2001 |
| From: Peter Chiu <chui-hao.chiu@mediatek.com> |
| Date: Fri, 19 Jan 2024 15:22:00 +0800 |
| Subject: [PATCH 44/61] mtk: wifi: mac80211: add wds mlo support |
| |
| Support WDS mode when using MLO. |
| 1. Remove use_4addr check. |
| 2. Copy link information to AP_VLAN interface. |
| 3. Fill 4addr nullfunc by mld address. |
| |
| CR-Id: WCNCR00240772 |
| Signed-off-by: Peter Chiu <chui-hao.chiu@mediatek.com> |
| Change-Id: I620bb51e47965c2558751ae266609dad61d421b6 |
| --- |
| net/mac80211/cfg.c | 7 ------- |
| net/mac80211/iface.c | 19 +++++++++++-------- |
| net/mac80211/mlme.c | 15 +++++++++------ |
| 3 files changed, 20 insertions(+), 21 deletions(-) |
| |
| diff --git a/net/mac80211/cfg.c b/net/mac80211/cfg.c |
| index 3233e2a..0cb68fb 100644 |
| --- a/net/mac80211/cfg.c |
| +++ b/net/mac80211/cfg.c |
| @@ -229,10 +229,6 @@ static int ieee80211_change_iface(struct wiphy *wiphy, |
| if (params->use_4addr == ifmgd->use_4addr) |
| return 0; |
| |
| - /* FIXME: no support for 4-addr MLO yet */ |
| - if (ieee80211_vif_is_mld(&sdata->vif)) |
| - return -EOPNOTSUPP; |
| - |
| sdata->u.mgd.use_4addr = params->use_4addr; |
| if (!ifmgd->associated) |
| return 0; |
| @@ -4922,9 +4918,6 @@ static int ieee80211_add_intf_link(struct wiphy *wiphy, |
| |
| lockdep_assert_wiphy(sdata->local->hw.wiphy); |
| |
| - if (wdev->use_4addr) |
| - return -EOPNOTSUPP; |
| - |
| return ieee80211_vif_set_links(sdata, wdev->valid_links, 0); |
| } |
| |
| diff --git a/net/mac80211/iface.c b/net/mac80211/iface.c |
| index 0ae31a9..083da12 100644 |
| --- a/net/mac80211/iface.c |
| +++ b/net/mac80211/iface.c |
| @@ -381,19 +381,22 @@ static int ieee80211_check_concurrent_iface(struct ieee80211_sub_if_data *sdata, |
| nsdata->vif.type)) |
| return -ENOTUNIQ; |
| |
| - /* No support for VLAN with MLO yet */ |
| - if (iftype == NL80211_IFTYPE_AP_VLAN && |
| - sdata->wdev.use_4addr && |
| - nsdata->vif.type == NL80211_IFTYPE_AP && |
| - nsdata->vif.valid_links) |
| - return -EOPNOTSUPP; |
| - |
| /* |
| * can only add VLANs to enabled APs |
| */ |
| if (iftype == NL80211_IFTYPE_AP_VLAN && |
| - nsdata->vif.type == NL80211_IFTYPE_AP) |
| + nsdata->vif.type == NL80211_IFTYPE_AP) { |
| + int i; |
| + |
| sdata->bss = &nsdata->u.ap; |
| + sdata->vif.valid_links = nsdata->vif.valid_links; |
| + sdata->vif.active_links = nsdata->vif.active_links; |
| + sdata->vif.dormant_links = nsdata->vif.dormant_links; |
| + for (i = 0; i < IEEE80211_MLD_MAX_NUM_LINKS; i++) { |
| + sdata->link[i] = nsdata->link[i]; |
| + sdata->vif.link_conf[i] = nsdata->vif.link_conf[i]; |
| + } |
| + } |
| } |
| } |
| |
| diff --git a/net/mac80211/mlme.c b/net/mac80211/mlme.c |
| index 84ea805..674f3f5 100644 |
| --- a/net/mac80211/mlme.c |
| +++ b/net/mac80211/mlme.c |
| @@ -1829,6 +1829,7 @@ void ieee80211_send_4addr_nullfunc(struct ieee80211_local *local, |
| { |
| struct sk_buff *skb; |
| struct ieee80211_hdr *nullfunc; |
| + u8 assoc_link_id = ifmgd->assoc_data->assoc_link_id; |
| __le16 fc; |
| |
| if (WARN_ON(sdata->vif.type != NL80211_IFTYPE_STATION)) |
| @@ -1844,11 +1845,17 @@ void ieee80211_send_4addr_nullfunc(struct ieee80211_local *local, |
| fc = cpu_to_le16(IEEE80211_FTYPE_DATA | IEEE80211_STYPE_NULLFUNC | |
| IEEE80211_FCTL_FROMDS | IEEE80211_FCTL_TODS); |
| nullfunc->frame_control = fc; |
| - memcpy(nullfunc->addr1, sdata->deflink.u.mgd.bssid, ETH_ALEN); |
| memcpy(nullfunc->addr2, sdata->vif.addr, ETH_ALEN); |
| - memcpy(nullfunc->addr3, sdata->deflink.u.mgd.bssid, ETH_ALEN); |
| memcpy(nullfunc->addr4, sdata->vif.addr, ETH_ALEN); |
| |
| + if (ieee80211_vif_is_mld(&sdata->vif)) { |
| + memcpy(nullfunc->addr1, sdata->vif.cfg.ap_addr, ETH_ALEN); |
| + memcpy(nullfunc->addr3, sdata->vif.cfg.ap_addr, ETH_ALEN); |
| + } else { |
| + memcpy(nullfunc->addr1, sdata->deflink.u.mgd.bssid, ETH_ALEN); |
| + memcpy(nullfunc->addr3, sdata->deflink.u.mgd.bssid, ETH_ALEN); |
| + } |
| + |
| IEEE80211_SKB_CB(skb)->flags |= IEEE80211_TX_INTFL_DONT_ENCRYPT; |
| IEEE80211_SKB_CB(skb)->flags |= IEEE80211_TX_CTL_USE_MINRATE; |
| ieee80211_tx_skb(sdata, skb); |
| @@ -8229,10 +8236,6 @@ int ieee80211_mgd_assoc(struct ieee80211_sub_if_data *sdata, |
| for (i = 0; i < IEEE80211_MLD_MAX_NUM_LINKS; i++) |
| size += req->links[i].elems_len; |
| |
| - /* FIXME: no support for 4-addr MLO yet */ |
| - if (sdata->u.mgd.use_4addr && req->link_id >= 0) |
| - return -EOPNOTSUPP; |
| - |
| assoc_data = kzalloc(size, GFP_KERNEL); |
| if (!assoc_data) |
| return -ENOMEM; |
| -- |
| 2.39.2 |
| |