2018-09-23 16:02:35 +00:00
|
|
|
--- a/include/net/cfg80211.h
|
|
|
|
+++ b/include/net/cfg80211.h
|
2021-10-10 19:24:14 +00:00
|
|
|
@@ -3835,6 +3835,7 @@ struct mgmt_frame_regs {
|
2013-11-12 22:11:33 +00:00
|
|
|
* (as advertised by the nl80211 feature flag.)
|
|
|
|
* @get_tx_power: store the current TX power into the dbm variable;
|
|
|
|
* return 0 if successful
|
|
|
|
+ * @set_antenna_gain: set antenna gain to reduce maximum tx power if necessary
|
|
|
|
*
|
2021-10-04 21:48:20 +00:00
|
|
|
* @rfkill_poll: polls the hw rfkill line, use cfg80211 reporting
|
|
|
|
* functions to adjust rfkill hw state
|
2021-10-10 19:24:14 +00:00
|
|
|
@@ -4159,6 +4160,7 @@ struct cfg80211_ops {
|
2013-11-12 22:11:33 +00:00
|
|
|
enum nl80211_tx_power_setting type, int mbm);
|
|
|
|
int (*get_tx_power)(struct wiphy *wiphy, struct wireless_dev *wdev,
|
|
|
|
int *dbm);
|
|
|
|
+ int (*set_antenna_gain)(struct wiphy *wiphy, int dbi);
|
|
|
|
|
2021-10-04 21:48:20 +00:00
|
|
|
void (*rfkill_poll)(struct wiphy *wiphy);
|
|
|
|
|
2018-09-23 16:02:35 +00:00
|
|
|
--- a/include/net/mac80211.h
|
|
|
|
+++ b/include/net/mac80211.h
|
2021-10-10 19:24:14 +00:00
|
|
|
@@ -1566,6 +1566,7 @@ enum ieee80211_smps_mode {
|
2012-09-28 18:29:09 +00:00
|
|
|
*
|
2012-12-07 16:46:04 +00:00
|
|
|
* @power_level: requested transmit power (in dBm), backward compatibility
|
|
|
|
* value only that is set to the minimum of all interfaces
|
2012-09-28 18:29:09 +00:00
|
|
|
+ * @max_antenna_gain: maximum antenna gain adjusted by user config (in dBi)
|
|
|
|
*
|
2013-04-26 10:52:03 +00:00
|
|
|
* @chandef: the channel definition to tune to
|
|
|
|
* @radar_enabled: whether radar detection is enabled
|
2021-10-10 19:24:14 +00:00
|
|
|
@@ -1586,6 +1587,7 @@ enum ieee80211_smps_mode {
|
2015-10-30 15:17:56 +00:00
|
|
|
struct ieee80211_conf {
|
2012-09-28 18:29:09 +00:00
|
|
|
u32 flags;
|
|
|
|
int power_level, dynamic_ps_timeout;
|
|
|
|
+ int max_antenna_gain;
|
|
|
|
|
|
|
|
u16 listen_interval;
|
|
|
|
u8 ps_dtim_period;
|
2018-09-23 16:02:35 +00:00
|
|
|
--- a/include/uapi/linux/nl80211.h
|
|
|
|
+++ b/include/uapi/linux/nl80211.h
|
2021-09-24 14:53:33 +00:00
|
|
|
@@ -2593,6 +2593,9 @@ enum nl80211_commands {
|
|
|
|
* @NL80211_ATTR_COLOR_CHANGE_ELEMS: Nested set of attributes containing the IE
|
|
|
|
* information for the time while performing a color switch.
|
2013-09-08 09:38:38 +00:00
|
|
|
*
|
|
|
|
+ * @NL80211_ATTR_WIPHY_ANTENNA_GAIN: Configured antenna gain. Used to reduce
|
2013-11-12 22:11:33 +00:00
|
|
|
+ * transmit power to stay within regulatory limits. u32, dBi.
|
2013-09-08 09:38:38 +00:00
|
|
|
+ *
|
2015-03-11 15:02:47 +00:00
|
|
|
* @NUM_NL80211_ATTR: total number of nl80211_attrs available
|
2013-09-08 09:38:38 +00:00
|
|
|
* @NL80211_ATTR_MAX: highest attribute number currently defined
|
|
|
|
* @__NL80211_ATTR_AFTER_LAST: internal use
|
2021-09-24 14:53:33 +00:00
|
|
|
@@ -3096,6 +3099,8 @@ enum nl80211_attrs {
|
|
|
|
NL80211_ATTR_COLOR_CHANGE_COLOR,
|
|
|
|
NL80211_ATTR_COLOR_CHANGE_ELEMS,
|
2012-09-28 18:29:09 +00:00
|
|
|
|
|
|
|
+ NL80211_ATTR_WIPHY_ANTENNA_GAIN,
|
|
|
|
+
|
|
|
|
/* add attributes here, update the policy in nl80211.c */
|
|
|
|
|
|
|
|
__NL80211_ATTR_AFTER_LAST,
|
2018-09-23 16:02:35 +00:00
|
|
|
--- a/net/mac80211/cfg.c
|
|
|
|
+++ b/net/mac80211/cfg.c
|
2021-10-10 19:24:14 +00:00
|
|
|
@@ -2760,6 +2760,19 @@ static int ieee80211_get_tx_power(struct
|
2012-09-28 18:29:09 +00:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
+static int ieee80211_set_antenna_gain(struct wiphy *wiphy, int dbi)
|
|
|
|
+{
|
|
|
|
+ struct ieee80211_local *local = wiphy_priv(wiphy);
|
|
|
|
+
|
|
|
|
+ if (dbi < 0)
|
|
|
|
+ return -EINVAL;
|
|
|
|
+
|
|
|
|
+ local->user_antenna_gain = dbi;
|
|
|
|
+ ieee80211_hw_config(local, 0);
|
|
|
|
+
|
|
|
|
+ return 0;
|
|
|
|
+}
|
|
|
|
+
|
2021-10-04 21:48:20 +00:00
|
|
|
static void ieee80211_rfkill_poll(struct wiphy *wiphy)
|
2012-09-28 18:29:09 +00:00
|
|
|
{
|
2021-10-04 21:48:20 +00:00
|
|
|
struct ieee80211_local *local = wiphy_priv(wiphy);
|
2021-10-10 19:24:14 +00:00
|
|
|
@@ -4395,6 +4408,7 @@ const struct cfg80211_ops mac80211_confi
|
2012-09-28 18:29:09 +00:00
|
|
|
.set_wiphy_params = ieee80211_set_wiphy_params,
|
|
|
|
.set_tx_power = ieee80211_set_tx_power,
|
|
|
|
.get_tx_power = ieee80211_get_tx_power,
|
|
|
|
+ .set_antenna_gain = ieee80211_set_antenna_gain,
|
|
|
|
.rfkill_poll = ieee80211_rfkill_poll,
|
|
|
|
CFG80211_TESTMODE_CMD(ieee80211_testmode_cmd)
|
2021-10-04 21:48:20 +00:00
|
|
|
CFG80211_TESTMODE_DUMP(ieee80211_testmode_dump)
|
2018-09-23 16:02:35 +00:00
|
|
|
--- a/net/mac80211/ieee80211_i.h
|
|
|
|
+++ b/net/mac80211/ieee80211_i.h
|
2021-10-18 22:44:43 +00:00
|
|
|
@@ -1429,6 +1429,7 @@ struct ieee80211_local {
|
2013-11-12 22:11:33 +00:00
|
|
|
int dynamic_ps_forced_timeout;
|
|
|
|
|
|
|
|
int user_power_level; /* in dBm, for all interfaces */
|
|
|
|
+ int user_antenna_gain; /* in dBi */
|
|
|
|
|
|
|
|
enum ieee80211_smps_mode smps_mode;
|
2012-09-28 18:29:09 +00:00
|
|
|
|
2018-09-23 16:02:35 +00:00
|
|
|
--- a/net/mac80211/main.c
|
|
|
|
+++ b/net/mac80211/main.c
|
2020-06-20 21:11:17 +00:00
|
|
|
@@ -96,7 +96,7 @@ static u32 ieee80211_hw_conf_chan(struct
|
2013-11-12 22:11:33 +00:00
|
|
|
struct ieee80211_sub_if_data *sdata;
|
2013-04-26 10:52:03 +00:00
|
|
|
struct cfg80211_chan_def chandef = {};
|
2012-12-07 16:46:04 +00:00
|
|
|
u32 changed = 0;
|
2013-11-12 22:11:33 +00:00
|
|
|
- int power;
|
2014-04-08 22:11:23 +00:00
|
|
|
+ int power, max_power;
|
2012-12-07 16:46:04 +00:00
|
|
|
u32 offchannel_flag;
|
2013-04-26 10:52:03 +00:00
|
|
|
|
|
|
|
offchannel_flag = local->hw.conf.flags & IEEE80211_CONF_OFFCHANNEL;
|
2020-06-20 21:11:17 +00:00
|
|
|
@@ -157,6 +157,12 @@ static u32 ieee80211_hw_conf_chan(struct
|
2013-11-12 22:11:33 +00:00
|
|
|
}
|
|
|
|
rcu_read_unlock();
|
2012-12-07 16:46:04 +00:00
|
|
|
|
2013-04-26 10:52:03 +00:00
|
|
|
+ max_power = chandef.chan->max_reg_power;
|
2012-12-07 16:46:04 +00:00
|
|
|
+ if (local->user_antenna_gain > 0) {
|
2014-04-08 22:11:23 +00:00
|
|
|
+ max_power -= local->user_antenna_gain;
|
2012-12-10 13:51:09 +00:00
|
|
|
+ power = min(power, max_power);
|
2012-12-07 16:46:04 +00:00
|
|
|
+ }
|
|
|
|
+
|
2014-04-08 22:11:23 +00:00
|
|
|
if (local->hw.conf.power_level != power) {
|
2012-12-07 16:46:04 +00:00
|
|
|
changed |= IEEE80211_CONF_CHANGE_POWER;
|
2014-10-22 16:26:56 +00:00
|
|
|
local->hw.conf.power_level = power;
|
2021-10-09 17:25:36 +00:00
|
|
|
@@ -679,6 +685,7 @@ struct ieee80211_hw *ieee80211_alloc_hw_
|
2012-12-07 16:46:04 +00:00
|
|
|
IEEE80211_RADIOTAP_MCS_HAVE_BW;
|
|
|
|
local->hw.radiotap_vht_details = IEEE80211_RADIOTAP_VHT_KNOWN_GI |
|
|
|
|
IEEE80211_RADIOTAP_VHT_KNOWN_BANDWIDTH;
|
|
|
|
+ local->user_antenna_gain = 0;
|
2013-04-26 10:52:03 +00:00
|
|
|
local->hw.uapsd_queues = IEEE80211_DEFAULT_UAPSD_QUEUES;
|
|
|
|
local->hw.uapsd_max_sp_len = IEEE80211_DEFAULT_MAX_SP_LEN;
|
2019-10-01 21:28:36 +00:00
|
|
|
local->hw.max_mtu = IEEE80211_MAX_DATA_LEN;
|
2018-09-23 16:02:35 +00:00
|
|
|
--- a/net/wireless/nl80211.c
|
|
|
|
+++ b/net/wireless/nl80211.c
|
2021-10-09 17:25:36 +00:00
|
|
|
@@ -780,6 +780,7 @@ static const struct nla_policy nl80211_p
|
2021-09-24 14:53:33 +00:00
|
|
|
[NL80211_ATTR_COLOR_CHANGE_COUNT] = { .type = NLA_U8 },
|
|
|
|
[NL80211_ATTR_COLOR_CHANGE_COLOR] = { .type = NLA_U8 },
|
|
|
|
[NL80211_ATTR_COLOR_CHANGE_ELEMS] = NLA_POLICY_NESTED(nl80211_policy),
|
2013-11-12 22:11:33 +00:00
|
|
|
+ [NL80211_ATTR_WIPHY_ANTENNA_GAIN] = { .type = NLA_U32 },
|
|
|
|
};
|
|
|
|
|
|
|
|
/* policy for the key attributes */
|
2021-11-13 17:24:52 +00:00
|
|
|
@@ -3324,6 +3325,22 @@ static int nl80211_set_wiphy(struct sk_b
|
|
|
|
if (result)
|
2021-10-09 14:25:30 +00:00
|
|
|
goto out;
|
2013-11-12 22:11:33 +00:00
|
|
|
}
|
2021-11-13 17:24:52 +00:00
|
|
|
+
|
2013-11-12 22:11:33 +00:00
|
|
|
+ if (info->attrs[NL80211_ATTR_WIPHY_ANTENNA_GAIN]) {
|
|
|
|
+ int idx, dbi = 0;
|
|
|
|
+
|
2021-11-13 17:24:52 +00:00
|
|
|
+ if (!rdev->ops->set_antenna_gain) {
|
|
|
|
+ result = -EOPNOTSUPP;
|
|
|
|
+ goto out;
|
|
|
|
+ }
|
2013-11-12 22:11:33 +00:00
|
|
|
+
|
|
|
|
+ idx = NL80211_ATTR_WIPHY_ANTENNA_GAIN;
|
|
|
|
+ dbi = nla_get_u32(info->attrs[idx]);
|
|
|
|
+
|
|
|
|
+ result = rdev->ops->set_antenna_gain(&rdev->wiphy, dbi);
|
|
|
|
+ if (result)
|
2021-11-13 17:24:52 +00:00
|
|
|
+ goto out;
|
2013-11-12 22:11:33 +00:00
|
|
|
+ }
|
2021-11-13 17:24:52 +00:00
|
|
|
|
2021-10-09 14:25:30 +00:00
|
|
|
if (info->attrs[NL80211_ATTR_WIPHY_TX_POWER_SETTING]) {
|
|
|
|
struct wireless_dev *txp_wdev = wdev;
|