From 1e9f4ca96550b70a9e73ce8fed9db940bd4c7d29 Mon Sep 17 00:00:00 2001 From: Jouni Malinen Date: Sat, 22 Nov 2008 22:00:31 +0200 Subject: [PATCH] --- yaml --- r: 122337 b: refs/heads/master c: bf8c1ac6d81ba8c0e4dc2215f84f5e2a3c8227e8 h: refs/heads/master i: 122335: f6e6583d82290db7083bfa89c13080c0f9636d91 v: v3 --- [refs] | 2 +- trunk/include/linux/nl80211.h | 3 ++- trunk/net/wireless/nl80211.c | 4 ++-- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index f2b91d8974f0..9c9cdb91fc43 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 39d1ffee57c7ce02c90ec8e9272df8aa8ddf600f +refs/heads/master: bf8c1ac6d81ba8c0e4dc2215f84f5e2a3c8227e8 diff --git a/trunk/include/linux/nl80211.h b/trunk/include/linux/nl80211.h index 54d6ebe38e39..e08c8bcfb78d 100644 --- a/trunk/include/linux/nl80211.h +++ b/trunk/include/linux/nl80211.h @@ -508,7 +508,8 @@ enum nl80211_band_attr { * on this channel in current regulatory domain. * @NL80211_FREQUENCY_ATTR_RADAR: Radar detection is mandatory * on this channel in current regulatory domain. - * @NL80211_FREQUENCY_ATTR_MAX_TX_POWER: Maximum transmission power in dBm. + * @NL80211_FREQUENCY_ATTR_MAX_TX_POWER: Maximum transmission power in mBm + * (100 * dBm). */ enum nl80211_frequency_attr { __NL80211_FREQUENCY_ATTR_INVALID, diff --git a/trunk/net/wireless/nl80211.c b/trunk/net/wireless/nl80211.c index 2e8464eaaaa2..c9141e3df9ba 100644 --- a/trunk/net/wireless/nl80211.c +++ b/trunk/net/wireless/nl80211.c @@ -198,8 +198,8 @@ static int nl80211_send_wiphy(struct sk_buff *msg, u32 pid, u32 seq, int flags, if (chan->flags & IEEE80211_CHAN_RADAR) NLA_PUT_FLAG(msg, NL80211_FREQUENCY_ATTR_RADAR); - NLA_PUT_U8(msg, NL80211_FREQUENCY_ATTR_MAX_TX_POWER, - chan->max_power); + NLA_PUT_U32(msg, NL80211_FREQUENCY_ATTR_MAX_TX_POWER, + DBM_TO_MBM(chan->max_power)); nla_nest_end(msg, nl_freq); }