path: root/net/wireless
diff options
authorRafał Miłecki <zajec5@gmail.com>2015-08-31 22:59:38 +0200
committerJohannes Berg <johannes.berg@intel.com>2015-09-22 15:21:27 +0200
commitd55d0d598e6610bbfcc1f2ecd6e8af669b94783b (patch)
tree537d25e2089a590f57b38f687584de53894b6e81 /net/wireless
parent0edd5faeb07bfd3ec5402f9467e4c169dcd131e8 (diff)
nl80211: put current TX power in interface info
Many drivers implement reading current TX power (using either cfg80211 or ieee80211 op) but userspace can't get it using nl80211. Right now the only way to access it is to call some wext ioctl. Let's put TX power in interface info reply (callback is wdev specific) just like we do with current channel. To be consistent (e.g. NL80211_CMD_SET_WIPHY) let's use mBm as na unit. Signed-off-by: Rafał Miłecki <zajec5@gmail.com> Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'net/wireless')
1 files changed, 10 insertions, 0 deletions
diff --git a/net/wireless/nl80211.c b/net/wireless/nl80211.c
index a4e6c951950f..50cd7707040c 100644
--- a/net/wireless/nl80211.c
+++ b/net/wireless/nl80211.c
@@ -2404,6 +2404,16 @@ static int nl80211_send_iface(struct sk_buff *msg, u32 portid, u32 seq, int flag
+ if (rdev->ops->get_tx_power) {
+ int dbm, ret;
+ ret = rdev_get_tx_power(rdev, wdev, &dbm);
+ if (ret == 0 &&
+ nla_put_u32(msg, NL80211_ATTR_WIPHY_TX_POWER_LEVEL,
+ DBM_TO_MBM(dbm)))
+ goto nla_put_failure;
+ }
if (wdev->ssid_len) {
if (nla_put(msg, NL80211_ATTR_SSID, wdev->ssid_len, wdev->ssid))
goto nla_put_failure;