developer | bba872d | 2023-09-20 13:23:33 +0800 | [diff] [blame] | 1 | From f6907ff7ff3669e73f64f802de10346bfd1d24d8 Mon Sep 17 00:00:00 2001 |
developer | 4a339e8 | 2022-12-12 19:00:30 +0800 | [diff] [blame] | 2 | From: MeiChia Chiu <meichia.chiu@mediatek.com> |
| 3 | Date: Wed, 19 Oct 2022 13:45:42 +0800 |
developer | bba872d | 2023-09-20 13:23:33 +0800 | [diff] [blame] | 4 | Subject: [PATCH] mac80211: mtk: add support for runtime set inband discovery |
developer | 4a339e8 | 2022-12-12 19:00:30 +0800 | [diff] [blame] | 5 | |
| 6 | Signed-off-by: MeiChia Chiu <meichia.chiu@mediatek.com> |
| 7 | --- |
| 8 | include/net/cfg80211.h | 1 + |
| 9 | include/net/mac80211.h | 1 + |
| 10 | include/uapi/linux/nl80211.h | 1 + |
developer | bba872d | 2023-09-20 13:23:33 +0800 | [diff] [blame] | 11 | net/mac80211/cfg.c | 30 +++++++++++++++++++++++++++++- |
developer | 83ad30d | 2023-09-12 17:28:06 +0800 | [diff] [blame] | 12 | net/wireless/nl80211.c | 33 ++++++++++++++++++++++++++++----- |
developer | bba872d | 2023-09-20 13:23:33 +0800 | [diff] [blame] | 13 | 5 files changed, 60 insertions(+), 6 deletions(-) |
developer | 4a339e8 | 2022-12-12 19:00:30 +0800 | [diff] [blame] | 14 | |
| 15 | diff --git a/include/net/cfg80211.h b/include/net/cfg80211.h |
developer | bba872d | 2023-09-20 13:23:33 +0800 | [diff] [blame] | 16 | index 072a787..02e342e 100644 |
developer | 4a339e8 | 2022-12-12 19:00:30 +0800 | [diff] [blame] | 17 | --- a/include/net/cfg80211.h |
| 18 | +++ b/include/net/cfg80211.h |
developer | bba872d | 2023-09-20 13:23:33 +0800 | [diff] [blame] | 19 | @@ -1309,6 +1309,7 @@ struct cfg80211_fils_discovery { |
developer | 4a339e8 | 2022-12-12 19:00:30 +0800 | [diff] [blame] | 20 | u32 max_interval; |
| 21 | size_t tmpl_len; |
| 22 | const u8 *tmpl; |
| 23 | + u8 disable; |
| 24 | }; |
| 25 | |
| 26 | /** |
| 27 | diff --git a/include/net/mac80211.h b/include/net/mac80211.h |
developer | 83ad30d | 2023-09-12 17:28:06 +0800 | [diff] [blame] | 28 | index 2e5b5c6..96e4ec9 100644 |
developer | 4a339e8 | 2022-12-12 19:00:30 +0800 | [diff] [blame] | 29 | --- a/include/net/mac80211.h |
| 30 | +++ b/include/net/mac80211.h |
developer | ebaa551 | 2023-04-19 18:23:21 +0800 | [diff] [blame] | 31 | @@ -526,6 +526,7 @@ struct ieee80211_ftm_responder_params { |
developer | 4a339e8 | 2022-12-12 19:00:30 +0800 | [diff] [blame] | 32 | struct ieee80211_fils_discovery { |
| 33 | u32 min_interval; |
| 34 | u32 max_interval; |
| 35 | + u8 disable; |
| 36 | }; |
| 37 | |
| 38 | /** |
| 39 | diff --git a/include/uapi/linux/nl80211.h b/include/uapi/linux/nl80211.h |
developer | 83ad30d | 2023-09-12 17:28:06 +0800 | [diff] [blame] | 40 | index 88eb85c..72ef4d9 100644 |
developer | 4a339e8 | 2022-12-12 19:00:30 +0800 | [diff] [blame] | 41 | --- a/include/uapi/linux/nl80211.h |
| 42 | +++ b/include/uapi/linux/nl80211.h |
developer | 83ad30d | 2023-09-12 17:28:06 +0800 | [diff] [blame] | 43 | @@ -7619,6 +7619,7 @@ enum nl80211_fils_discovery_attributes { |
developer | 4a339e8 | 2022-12-12 19:00:30 +0800 | [diff] [blame] | 44 | NL80211_FILS_DISCOVERY_ATTR_INT_MIN, |
| 45 | NL80211_FILS_DISCOVERY_ATTR_INT_MAX, |
| 46 | NL80211_FILS_DISCOVERY_ATTR_TMPL, |
| 47 | + NL80211_UNSOL_BCAST_PROBE_RESP_ATTR_INTE, |
| 48 | |
| 49 | /* keep last */ |
| 50 | __NL80211_FILS_DISCOVERY_ATTR_LAST, |
| 51 | diff --git a/net/mac80211/cfg.c b/net/mac80211/cfg.c |
developer | bba872d | 2023-09-20 13:23:33 +0800 | [diff] [blame] | 52 | index f4649d1..baff0e6 100644 |
developer | 4a339e8 | 2022-12-12 19:00:30 +0800 | [diff] [blame] | 53 | --- a/net/mac80211/cfg.c |
| 54 | +++ b/net/mac80211/cfg.c |
developer | 83ad30d | 2023-09-12 17:28:06 +0800 | [diff] [blame] | 55 | @@ -990,6 +990,7 @@ static int ieee80211_set_fils_discovery(struct ieee80211_sub_if_data *sdata, |
developer | 4a339e8 | 2022-12-12 19:00:30 +0800 | [diff] [blame] | 56 | fd = &link_conf->fils_discovery; |
| 57 | fd->min_interval = params->min_interval; |
| 58 | fd->max_interval = params->max_interval; |
| 59 | + fd->disable = params->disable; |
| 60 | |
| 61 | old = sdata_dereference(link->u.ap.fils_discovery, sdata); |
| 62 | new = kzalloc(sizeof(*new) + params->tmpl_len, GFP_KERNEL); |
developer | 83ad30d | 2023-09-12 17:28:06 +0800 | [diff] [blame] | 63 | @@ -1513,9 +1514,11 @@ static int ieee80211_change_beacon(struct wiphy *wiphy, struct net_device *dev, |
developer | 4a339e8 | 2022-12-12 19:00:30 +0800 | [diff] [blame] | 64 | struct ieee80211_sub_if_data *sdata = IEEE80211_DEV_TO_SUB_IF(dev); |
| 65 | struct ieee80211_link_data *link; |
| 66 | struct beacon_data *old; |
| 67 | + struct cfg80211_ap_settings *ap_params; |
| 68 | + struct ieee80211_supported_band *sband; |
developer | 83ad30d | 2023-09-12 17:28:06 +0800 | [diff] [blame] | 69 | + u64 changed = 0; |
developer | 4a339e8 | 2022-12-12 19:00:30 +0800 | [diff] [blame] | 70 | int err; |
| 71 | struct ieee80211_bss_conf *link_conf; |
developer | 83ad30d | 2023-09-12 17:28:06 +0800 | [diff] [blame] | 72 | - u64 changed = 0; |
developer | 4a339e8 | 2022-12-12 19:00:30 +0800 | [diff] [blame] | 73 | |
developer | 83ad30d | 2023-09-12 17:28:06 +0800 | [diff] [blame] | 74 | sdata_assert_lock(sdata); |
| 75 | |
developer | bba872d | 2023-09-20 13:23:33 +0800 | [diff] [blame] | 76 | @@ -1546,6 +1549,31 @@ static int ieee80211_change_beacon(struct wiphy *wiphy, struct net_device *dev, |
developer | 83ad30d | 2023-09-12 17:28:06 +0800 | [diff] [blame] | 77 | changed |= BSS_CHANGED_HE_BSS_COLOR; |
developer | 4a339e8 | 2022-12-12 19:00:30 +0800 | [diff] [blame] | 78 | } |
| 79 | |
developer | 4a339e8 | 2022-12-12 19:00:30 +0800 | [diff] [blame] | 80 | + sband = ieee80211_get_sband(sdata); |
| 81 | + if (!sband) |
| 82 | + return -EINVAL; |
| 83 | + |
| 84 | + if (sband->band == NL80211_BAND_6GHZ) { |
| 85 | + ap_params = container_of(params, struct cfg80211_ap_settings, beacon); |
| 86 | + |
| 87 | + if(ap_params->unsol_bcast_probe_resp.interval) { |
| 88 | + err = ieee80211_set_unsol_bcast_probe_resp(sdata, |
| 89 | + &ap_params->unsol_bcast_probe_resp, |
| 90 | + link, link_conf); |
| 91 | + if (err < 0) |
| 92 | + return err; |
| 93 | + changed |= BSS_CHANGED_UNSOL_BCAST_PROBE_RESP; |
| 94 | + } else { |
| 95 | + err = ieee80211_set_fils_discovery(sdata, |
| 96 | + &ap_params->fils_discovery, |
| 97 | + link, link_conf); |
| 98 | + |
| 99 | + if (err < 0) |
| 100 | + return err; |
| 101 | + changed |= BSS_CHANGED_FILS_DISCOVERY; |
| 102 | + } |
| 103 | + } |
| 104 | + |
developer | 83ad30d | 2023-09-12 17:28:06 +0800 | [diff] [blame] | 105 | ieee80211_link_info_change_notify(sdata, link, changed); |
developer | 4a339e8 | 2022-12-12 19:00:30 +0800 | [diff] [blame] | 106 | return 0; |
| 107 | } |
developer | 4a339e8 | 2022-12-12 19:00:30 +0800 | [diff] [blame] | 108 | diff --git a/net/wireless/nl80211.c b/net/wireless/nl80211.c |
developer | 83ad30d | 2023-09-12 17:28:06 +0800 | [diff] [blame] | 109 | index e0ee534..ff8afa5 100644 |
developer | 4a339e8 | 2022-12-12 19:00:30 +0800 | [diff] [blame] | 110 | --- a/net/wireless/nl80211.c |
| 111 | +++ b/net/wireless/nl80211.c |
| 112 | @@ -423,6 +423,7 @@ nl80211_fils_discovery_policy[NL80211_FILS_DISCOVERY_ATTR_MAX + 1] = { |
| 113 | [NL80211_FILS_DISCOVERY_ATTR_INT_MAX] = NLA_POLICY_MAX(NLA_U32, 10000), |
| 114 | [NL80211_FILS_DISCOVERY_ATTR_TMPL] = |
| 115 | NLA_POLICY_BINARY_RANGE(NL80211_FILS_DISCOVERY_TMPL_MIN_LEN, IEEE80211_MAX_DATA_LEN), |
| 116 | + [NL80211_UNSOL_BCAST_PROBE_RESP_ATTR_INTE] = NLA_POLICY_MAX(NLA_U32, 20), |
| 117 | }; |
| 118 | |
| 119 | static const struct nla_policy |
developer | 83ad30d | 2023-09-12 17:28:06 +0800 | [diff] [blame] | 120 | @@ -5692,6 +5693,8 @@ static int nl80211_parse_fils_discovery(struct cfg80211_registered_device *rdev, |
developer | 4a339e8 | 2022-12-12 19:00:30 +0800 | [diff] [blame] | 121 | fd->tmpl = nla_data(tb[NL80211_FILS_DISCOVERY_ATTR_TMPL]); |
| 122 | fd->min_interval = nla_get_u32(tb[NL80211_FILS_DISCOVERY_ATTR_INT_MIN]); |
| 123 | fd->max_interval = nla_get_u32(tb[NL80211_FILS_DISCOVERY_ATTR_INT_MAX]); |
| 124 | + fd->disable = !(fd->max_interval || |
| 125 | + nla_get_u32(tb[NL80211_UNSOL_BCAST_PROBE_RESP_ATTR_INTE])); |
| 126 | |
| 127 | return 0; |
| 128 | } |
developer | 83ad30d | 2023-09-12 17:28:06 +0800 | [diff] [blame] | 129 | @@ -6224,7 +6227,8 @@ static int nl80211_set_beacon(struct sk_buff *skb, struct genl_info *info) |
developer | 4a339e8 | 2022-12-12 19:00:30 +0800 | [diff] [blame] | 130 | unsigned int link_id = nl80211_link_id(info->attrs); |
| 131 | struct net_device *dev = info->user_ptr[1]; |
| 132 | struct wireless_dev *wdev = dev->ieee80211_ptr; |
| 133 | - struct cfg80211_beacon_data params; |
| 134 | + struct cfg80211_ap_settings ap_params; |
| 135 | + struct cfg80211_beacon_data *params; |
| 136 | int err; |
| 137 | |
| 138 | if (dev->ieee80211_ptr->iftype != NL80211_IFTYPE_AP && |
developer | 83ad30d | 2023-09-12 17:28:06 +0800 | [diff] [blame] | 139 | @@ -6237,17 +6241,36 @@ static int nl80211_set_beacon(struct sk_buff *skb, struct genl_info *info) |
developer | 4a339e8 | 2022-12-12 19:00:30 +0800 | [diff] [blame] | 140 | if (!wdev->links[link_id].ap.beacon_interval) |
| 141 | return -EINVAL; |
| 142 | |
developer | 83ad30d | 2023-09-12 17:28:06 +0800 | [diff] [blame] | 143 | - err = nl80211_parse_beacon(rdev, info->attrs, ¶ms, info->extack); |
developer | 4a339e8 | 2022-12-12 19:00:30 +0800 | [diff] [blame] | 144 | + memset(&ap_params, 0, sizeof(ap_params)); |
| 145 | + params = &ap_params.beacon; |
| 146 | + |
developer | 83ad30d | 2023-09-12 17:28:06 +0800 | [diff] [blame] | 147 | + err = nl80211_parse_beacon(rdev, info->attrs, params, info->extack); |
developer | 4a339e8 | 2022-12-12 19:00:30 +0800 | [diff] [blame] | 148 | if (err) |
| 149 | goto out; |
| 150 | |
| 151 | + if (info->attrs[NL80211_ATTR_FILS_DISCOVERY]) { |
| 152 | + err = nl80211_parse_fils_discovery(rdev, |
| 153 | + info->attrs[NL80211_ATTR_FILS_DISCOVERY], |
| 154 | + &ap_params); |
| 155 | + if (err) |
| 156 | + goto out; |
| 157 | + } |
| 158 | + |
| 159 | + if (info->attrs[NL80211_ATTR_UNSOL_BCAST_PROBE_RESP]) { |
| 160 | + err = nl80211_parse_unsol_bcast_probe_resp(rdev, |
| 161 | + info->attrs[NL80211_ATTR_UNSOL_BCAST_PROBE_RESP], |
| 162 | + &ap_params); |
| 163 | + if (err) |
| 164 | + goto out; |
| 165 | + } |
| 166 | + |
| 167 | wdev_lock(wdev); |
| 168 | - err = rdev_change_beacon(rdev, dev, ¶ms); |
| 169 | + err = rdev_change_beacon(rdev, dev, params); |
| 170 | wdev_unlock(wdev); |
| 171 | |
| 172 | out: |
| 173 | - kfree(params.mbssid_ies); |
developer | 83ad30d | 2023-09-12 17:28:06 +0800 | [diff] [blame] | 174 | - kfree(params.rnr_ies); |
developer | 4a339e8 | 2022-12-12 19:00:30 +0800 | [diff] [blame] | 175 | + kfree(params->mbssid_ies); |
developer | 83ad30d | 2023-09-12 17:28:06 +0800 | [diff] [blame] | 176 | + kfree(params->rnr_ies); |
developer | 4a339e8 | 2022-12-12 19:00:30 +0800 | [diff] [blame] | 177 | return err; |
| 178 | } |
| 179 | |
| 180 | -- |
developer | bba872d | 2023-09-20 13:23:33 +0800 | [diff] [blame] | 181 | 2.25.1 |
developer | 4a339e8 | 2022-12-12 19:00:30 +0800 | [diff] [blame] | 182 | |