2 files changed, 40 insertions, 0 deletions

diff --git a/include/linux/nl80211.h b/include/linux/nl80211.h
index 07aa04693f94..2c8701687336 100644
--- a/include/linux/nl80211.h
+++ b/include/linux/nl80211.h
@@ -725,6 +725,12 @@ enum nl80211_commands {
  * @NL80211_ATTR_AP_ISOLATE: (AP mode) Do not forward traffic between stations
  *      connected to this BSS.
  *
+ * @NL80211_ATTR_WIPHY_TX_POWER_SETTING: Transmit power setting type. See
+ *      &enum nl80211_tx_power_setting for possible values.
+ * @NL80211_ATTR_WIPHY_TX_POWER_LEVEL: Transmit power level in signed mBm units.
+ *      This is used in association with @NL80211_ATTR_WIPHY_TX_POWER_SETTING
+ *      for non-automatic settings.
+ *
  * @NL80211_ATTR_MAX: highest attribute number currently defined
  * @__NL80211_ATTR_AFTER_LAST: internal use
  */
@@ -882,6 +888,9 @@ enum nl80211_attrs {
 
         NL80211_ATTR_AP_ISOLATE,
 
+        NL80211_ATTR_WIPHY_TX_POWER_SETTING,
+        NL80211_ATTR_WIPHY_TX_POWER_LEVEL,
+
         /* add attributes here, update the policy in nl80211.c */
 
         __NL80211_ATTR_AFTER_LAST,
diff --git a/net/wireless/nl80211.c b/net/wireless/nl80211.c
index 41529aca794c..a999fc154623 100644
--- a/net/wireless/nl80211.c
+++ b/net/wireless/nl80211.c
@@ -153,6 +153,9 @@ static const struct nla_policy nl80211_policy[NL80211_ATTR_MAX+1] = {
         [NL80211_ATTR_CQM] = { .type = NLA_NESTED, },
         [NL80211_ATTR_LOCAL_STATE_CHANGE] = { .type = NLA_FLAG },
         [NL80211_ATTR_AP_ISOLATE] = { .type = NLA_U8 },
+
+        [NL80211_ATTR_WIPHY_TX_POWER_SETTING] = { .type = NLA_U32 },
+        [NL80211_ATTR_WIPHY_TX_POWER_LEVEL] = { .type = NLA_U32 },
 };
 
 /* policy for the attributes */
@@ -869,6 +872,34 @@ static int nl80211_set_wiphy(struct sk_buff *skb, struct genl_info *info)
                         goto bad_res;
         }
 
+        if (info->attrs[NL80211_ATTR_WIPHY_TX_POWER_SETTING]) {
+                enum nl80211_tx_power_setting type;
+                int idx, mbm = 0;
+
+                if (!rdev->ops->set_tx_power) {
+                        return -EOPNOTSUPP;
+                        goto bad_res;
+                }
+
+                idx = NL80211_ATTR_WIPHY_TX_POWER_SETTING;
+                type = nla_get_u32(info->attrs[idx]);
+
+                if (!info->attrs[NL80211_ATTR_WIPHY_TX_POWER_LEVEL] &&
+                    (type != NL80211_TX_POWER_AUTOMATIC)) {
+                        result = -EINVAL;
+                        goto bad_res;
+                }
+
+                if (type != NL80211_TX_POWER_AUTOMATIC) {
+                        idx = NL80211_ATTR_WIPHY_TX_POWER_LEVEL;
+                        mbm = nla_get_u32(info->attrs[idx]);
+                }
+
+                result = rdev->ops->set_tx_power(&rdev->wiphy, type, mbm);
+                if (result)
+                        goto bad_res;
+        }
+
         changed = 0;
 
         if (info->attrs[NL80211_ATTR_WIPHY_RETRY_SHORT]) {