Skip to contentSkip to conversation

nl80211: Provide per channel maximum regulatory transmit power

PATCH In review Helmut Schaa 2 participants 3 messages Oct 2, 2013 802.11 (including cfg80211/NL80211)

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 nl80211: Provide per channel maximum regulatory transmit power

In some cases its not only required to know the maximum transmit power the hw is capable of. Instead, userspace (hostapd) might want to know the maximum transmit power as defined in the current regulatory domain (for example for 802.11d country IEs).

Hence, provide that information to user space via nl80211.

---
 include/uapi/linux/nl80211.h |    3 +++
 net/wireless/nl80211.c       |    4 ++++
 2 files changed, 7 insertions(+)
include/uapi/linux/nl80211.h +3 -0
index fde2c02..6130278 100644
@@ -2230,6 +2230,8 @@ enum nl80211_band_attr {
  *	isn't possible
  * @NL80211_FREQUENCY_ATTR_MAX: highest frequency attribute number
  *	currently defined
+ * @NL80211_FREQUENCY_ATTR_MAX_REG_TX_POWER: Maximum regulatory transmission
+ *	power in mBm (100 * dBm).
  * @__NL80211_FREQUENCY_ATTR_AFTER_LAST: internal use
  */
 enum nl80211_frequency_attr {
@@ -2246,6 +2248,7 @@ enum nl80211_frequency_attr {
 	NL80211_FREQUENCY_ATTR_NO_HT40_PLUS,
 	NL80211_FREQUENCY_ATTR_NO_80MHZ,
 	NL80211_FREQUENCY_ATTR_NO_160MHZ,
+	NL80211_FREQUENCY_ATTR_MAX_REG_TX_POWER,
 
 	/* keep last */
 	__NL80211_FREQUENCY_ATTR_AFTER_LAST,
net/wireless/nl80211.c +4 -0
index 626dc3b..7c22355 100644
@@ -584,6 +584,10 @@ static int nl80211_msg_put_channel(struct sk_buff *msg,
 			DBM_TO_MBM(chan->max_power)))
 		goto nla_put_failure;
 
+	if (nla_put_u32(msg, NL80211_FREQUENCY_ATTR_MAX_REG_TX_POWER,
+			DBM_TO_MBM(chan->max_reg_power)))
+		goto nla_put_failure;
+
 	return 0;
 
  nla_put_failure:
Signature · 1 line
1.7.10.4
maintainer
#1 lore raw
Quoted 4 lines · Helmut Schaa

In some cases its not only required to know the maximum transmit power the hw is capable of. Instead, userspace (hostapd) might want to know the maximum transmit power as defined in the current regulatory domain (for example for 802.11d country IEs).

Why wouldn't it use (the equivalent of) "iw reg get" for that?

net/wireless/nl80211.c static int nl80211_msg_put_channel(struct sk_buff *msg, · line 589

Quoted 3 lines
net/wireless/nl80211.c +3 -0
+	if (nla_put_u32(msg, NL80211_FREQUENCY_ATTR_MAX_REG_TX_POWER,
+			DBM_TO_MBM(chan->max_reg_power)))
+		goto nla_put_failure;

This would have to go into the "if (large)" part because otherwise older userspace can't read the info at all since it overflows the buffer.

johannes

#2 lore raw
Quoted 7 lines · Johannes Berg
Quoted 4 lines · Helmut Schaa

In some cases its not only required to know the maximum transmit power the hw is capable of. Instead, userspace (hostapd) might want to know the maximum transmit power as defined in the current regulatory domain (for example for 802.11d country IEs).

Why wouldn't it use (the equivalent of) "iw reg get" for that?

Might be the more sane approach.

I noticed that hostapd generates 11d IEs based on the channel list it reads from the kernel.
Thus restricting STAs to the max tx power the hw is capable of. Just adding the max regulatory
tx power looked like an easy solution :)

Jouni, would you be ok with using the kernels regulatory domain for 11d IEs in hostapd?

Thanks,
Helmut