developer | ebaa551 | 2023-04-19 18:23:21 +0800 | [diff] [blame] | 1 | From cefd58077419436745c1ca07daf75419c96e36b5 Mon Sep 17 00:00:00 2001 |
| 2 | From: Shayne Chen <shayne.chen@mediatek.com> |
| 3 | Date: Tue, 18 Apr 2023 15:37:08 +0800 |
| 4 | Subject: [PATCH 1/9] Revert mac80211_configure_antenna_gain |
| 5 | |
| 6 | --- |
| 7 | include/net/cfg80211.h | 2 -- |
| 8 | include/net/mac80211.h | 2 -- |
| 9 | include/uapi/linux/nl80211.h | 5 ----- |
| 10 | net/mac80211/cfg.c | 14 -------------- |
| 11 | net/mac80211/ieee80211_i.h | 1 - |
| 12 | net/mac80211/main.c | 9 +-------- |
| 13 | net/wireless/nl80211.c | 17 ----------------- |
| 14 | 7 files changed, 1 insertion(+), 49 deletions(-) |
| 15 | |
| 16 | diff --git a/include/net/cfg80211.h b/include/net/cfg80211.h |
| 17 | index 357a78f..803949b 100644 |
| 18 | --- a/include/net/cfg80211.h |
| 19 | +++ b/include/net/cfg80211.h |
| 20 | @@ -4081,7 +4081,6 @@ struct mgmt_frame_regs { |
| 21 | * (as advertised by the nl80211 feature flag.) |
| 22 | * @get_tx_power: store the current TX power into the dbm variable; |
| 23 | * return 0 if successful |
| 24 | - * @set_antenna_gain: set antenna gain to reduce maximum tx power if necessary |
| 25 | * |
| 26 | * @rfkill_poll: polls the hw rfkill line, use cfg80211 reporting |
| 27 | * functions to adjust rfkill hw state |
| 28 | @@ -4432,7 +4431,6 @@ struct cfg80211_ops { |
| 29 | enum nl80211_tx_power_setting type, int mbm); |
| 30 | int (*get_tx_power)(struct wiphy *wiphy, struct wireless_dev *wdev, |
| 31 | int *dbm); |
| 32 | - int (*set_antenna_gain)(struct wiphy *wiphy, int dbi); |
| 33 | |
| 34 | void (*rfkill_poll)(struct wiphy *wiphy); |
| 35 | |
| 36 | diff --git a/include/net/mac80211.h b/include/net/mac80211.h |
| 37 | index da3c3b3..9c59eb8 100644 |
| 38 | --- a/include/net/mac80211.h |
| 39 | +++ b/include/net/mac80211.h |
| 40 | @@ -1677,7 +1677,6 @@ enum ieee80211_smps_mode { |
| 41 | * |
| 42 | * @power_level: requested transmit power (in dBm), backward compatibility |
| 43 | * value only that is set to the minimum of all interfaces |
| 44 | - * @max_antenna_gain: maximum antenna gain adjusted by user config (in dBi) |
| 45 | * |
| 46 | * @chandef: the channel definition to tune to |
| 47 | * @radar_enabled: whether radar detection is enabled |
| 48 | @@ -1698,7 +1697,6 @@ enum ieee80211_smps_mode { |
| 49 | struct ieee80211_conf { |
| 50 | u32 flags; |
| 51 | int power_level, dynamic_ps_timeout; |
| 52 | - int max_antenna_gain; |
| 53 | |
| 54 | u16 listen_interval; |
| 55 | u8 ps_dtim_period; |
| 56 | diff --git a/include/uapi/linux/nl80211.h b/include/uapi/linux/nl80211.h |
| 57 | index ba4aa09..c32e761 100644 |
| 58 | --- a/include/uapi/linux/nl80211.h |
| 59 | +++ b/include/uapi/linux/nl80211.h |
| 60 | @@ -2749,9 +2749,6 @@ enum nl80211_commands { |
| 61 | * When used with %NL80211_CMD_FRAME_TX_STATUS, indicates the ack RX |
| 62 | * timestamp. When used with %NL80211_CMD_FRAME RX notification, indicates |
| 63 | * the incoming frame RX timestamp. |
| 64 | - * @NL80211_ATTR_WIPHY_ANTENNA_GAIN: Configured antenna gain. Used to reduce |
| 65 | - * transmit power to stay within regulatory limits. u32, dBi. |
| 66 | - * |
| 67 | * @NUM_NL80211_ATTR: total number of nl80211_attrs available |
| 68 | * @NL80211_ATTR_MAX: highest attribute number currently defined |
| 69 | * @__NL80211_ATTR_AFTER_LAST: internal use |
| 70 | @@ -3280,8 +3277,6 @@ enum nl80211_attrs { |
| 71 | NL80211_ATTR_TX_HW_TIMESTAMP, |
| 72 | NL80211_ATTR_RX_HW_TIMESTAMP, |
| 73 | |
| 74 | - NL80211_ATTR_WIPHY_ANTENNA_GAIN, |
| 75 | - |
| 76 | /* add attributes here, update the policy in nl80211.c */ |
| 77 | |
| 78 | __NL80211_ATTR_AFTER_LAST, |
| 79 | diff --git a/net/mac80211/cfg.c b/net/mac80211/cfg.c |
| 80 | index 5397fe9..7a5e459 100644 |
| 81 | --- a/net/mac80211/cfg.c |
| 82 | +++ b/net/mac80211/cfg.c |
| 83 | @@ -3046,19 +3046,6 @@ static int ieee80211_get_tx_power(struct wiphy *wiphy, |
| 84 | return 0; |
| 85 | } |
| 86 | |
| 87 | -static int ieee80211_set_antenna_gain(struct wiphy *wiphy, int dbi) |
| 88 | -{ |
| 89 | - struct ieee80211_local *local = wiphy_priv(wiphy); |
| 90 | - |
| 91 | - if (dbi < 0) |
| 92 | - return -EINVAL; |
| 93 | - |
| 94 | - local->user_antenna_gain = dbi; |
| 95 | - ieee80211_hw_config(local, 0); |
| 96 | - |
| 97 | - return 0; |
| 98 | -} |
| 99 | - |
| 100 | static void ieee80211_rfkill_poll(struct wiphy *wiphy) |
| 101 | { |
| 102 | struct ieee80211_local *local = wiphy_priv(wiphy); |
| 103 | @@ -4966,7 +4953,6 @@ const struct cfg80211_ops mac80211_config_ops = { |
| 104 | .set_wiphy_params = ieee80211_set_wiphy_params, |
| 105 | .set_tx_power = ieee80211_set_tx_power, |
| 106 | .get_tx_power = ieee80211_get_tx_power, |
| 107 | - .set_antenna_gain = ieee80211_set_antenna_gain, |
| 108 | .rfkill_poll = ieee80211_rfkill_poll, |
| 109 | CFG80211_TESTMODE_CMD(ieee80211_testmode_cmd) |
| 110 | CFG80211_TESTMODE_DUMP(ieee80211_testmode_dump) |
| 111 | diff --git a/net/mac80211/ieee80211_i.h b/net/mac80211/ieee80211_i.h |
| 112 | index e7bcdea..a4fab9a 100644 |
| 113 | --- a/net/mac80211/ieee80211_i.h |
| 114 | +++ b/net/mac80211/ieee80211_i.h |
| 115 | @@ -1538,7 +1538,6 @@ struct ieee80211_local { |
| 116 | int dynamic_ps_forced_timeout; |
| 117 | |
| 118 | int user_power_level; /* in dBm, for all interfaces */ |
| 119 | - int user_antenna_gain; /* in dBi */ |
| 120 | |
| 121 | enum ieee80211_smps_mode smps_mode; |
| 122 | |
| 123 | diff --git a/net/mac80211/main.c b/net/mac80211/main.c |
| 124 | index 83a1482..dfb9f4b 100644 |
| 125 | --- a/net/mac80211/main.c |
| 126 | +++ b/net/mac80211/main.c |
| 127 | @@ -96,7 +96,7 @@ static u32 ieee80211_hw_conf_chan(struct ieee80211_local *local) |
| 128 | struct ieee80211_sub_if_data *sdata; |
| 129 | struct cfg80211_chan_def chandef = {}; |
| 130 | u32 changed = 0; |
| 131 | - int power, max_power; |
| 132 | + int power; |
| 133 | u32 offchannel_flag; |
| 134 | |
| 135 | offchannel_flag = local->hw.conf.flags & IEEE80211_CONF_OFFCHANNEL; |
| 136 | @@ -157,12 +157,6 @@ static u32 ieee80211_hw_conf_chan(struct ieee80211_local *local) |
| 137 | } |
| 138 | rcu_read_unlock(); |
| 139 | |
| 140 | - max_power = chandef.chan->max_reg_power; |
| 141 | - if (local->user_antenna_gain > 0) { |
| 142 | - max_power -= local->user_antenna_gain; |
| 143 | - power = min(power, max_power); |
| 144 | - } |
| 145 | - |
| 146 | if (local->hw.conf.power_level != power) { |
| 147 | changed |= IEEE80211_CONF_CHANGE_POWER; |
| 148 | local->hw.conf.power_level = power; |
| 149 | @@ -768,7 +762,6 @@ struct ieee80211_hw *ieee80211_alloc_hw_nm(size_t priv_data_len, |
| 150 | IEEE80211_RADIOTAP_MCS_HAVE_BW; |
| 151 | local->hw.radiotap_vht_details = IEEE80211_RADIOTAP_VHT_KNOWN_GI | |
| 152 | IEEE80211_RADIOTAP_VHT_KNOWN_BANDWIDTH; |
| 153 | - local->user_antenna_gain = 0; |
| 154 | local->hw.uapsd_queues = IEEE80211_DEFAULT_UAPSD_QUEUES; |
| 155 | local->hw.uapsd_max_sp_len = IEEE80211_DEFAULT_MAX_SP_LEN; |
| 156 | local->hw.max_mtu = IEEE80211_MAX_DATA_LEN; |
| 157 | diff --git a/net/wireless/nl80211.c b/net/wireless/nl80211.c |
| 158 | index 507c868..777c141 100644 |
| 159 | --- a/net/wireless/nl80211.c |
| 160 | +++ b/net/wireless/nl80211.c |
| 161 | @@ -799,7 +799,6 @@ static const struct nla_policy nl80211_policy[NUM_NL80211_ATTR] = { |
| 162 | [NL80211_ATTR_MLD_ADDR] = NLA_POLICY_EXACT_LEN(ETH_ALEN), |
| 163 | [NL80211_ATTR_MLO_SUPPORT] = { .type = NLA_FLAG }, |
| 164 | [NL80211_ATTR_MAX_NUM_AKM_SUITES] = { .type = NLA_REJECT }, |
| 165 | - [NL80211_ATTR_WIPHY_ANTENNA_GAIN] = { .type = NLA_U32 }, |
| 166 | }; |
| 167 | |
| 168 | /* policy for the key attributes */ |
| 169 | @@ -3513,22 +3512,6 @@ static int nl80211_set_wiphy(struct sk_buff *skb, struct genl_info *info) |
| 170 | goto out; |
| 171 | } |
| 172 | |
| 173 | - if (info->attrs[NL80211_ATTR_WIPHY_ANTENNA_GAIN]) { |
| 174 | - int idx, dbi = 0; |
| 175 | - |
| 176 | - if (!rdev->ops->set_antenna_gain) { |
| 177 | - result = -EOPNOTSUPP; |
| 178 | - goto out; |
| 179 | - } |
| 180 | - |
| 181 | - idx = NL80211_ATTR_WIPHY_ANTENNA_GAIN; |
| 182 | - dbi = nla_get_u32(info->attrs[idx]); |
| 183 | - |
| 184 | - result = rdev->ops->set_antenna_gain(&rdev->wiphy, dbi); |
| 185 | - if (result) |
| 186 | - goto out; |
| 187 | - } |
| 188 | - |
| 189 | if (info->attrs[NL80211_ATTR_WIPHY_TX_POWER_SETTING]) { |
| 190 | struct wireless_dev *txp_wdev = wdev; |
| 191 | enum nl80211_tx_power_setting type; |
| 192 | -- |
| 193 | 2.39.2 |
| 194 | |