2013-02-18 22:49:55

by Johannes Berg

Subject: [PATCH 3.9] nl80211: remove radar channel information

From: Johannes Berg <[email protected]>

The wiphy information is getting very close to being too
much for a typical netlink dump message, and adding the
two radar attributes to a number of channels can push it
over the limit, which means userspace gets no information
at all. Therefore, revert it for now. We're working on a
solution that will allow userspace to request splitting
the information across multiple netlink messages, which
will allow us to add this back.

Cc: Simon Wunderlich <[email protected]>
Signed-off-by: Johannes Berg <[email protected]>
---
net/wireless/nl80211.c | 13 +++----------
1 file changed, 3 insertions(+), 10 deletions(-)

diff --git a/net/wireless/nl80211.c b/net/wireless/nl80211.c
index 0666ac3..fff4160 100644
--- a/net/wireless/nl80211.c
+++ b/net/wireless/nl80211.c
@@ -555,16 +555,9 @@ static int nl80211_msg_put_channel(struct sk_buff *msg,
if ((chan->flags & IEEE80211_CHAN_NO_IBSS) &&
nla_put_flag(msg, NL80211_FREQUENCY_ATTR_NO_IBSS))
goto nla_put_failure;
- if (chan->flags & IEEE80211_CHAN_RADAR) {
- u32 time = elapsed_jiffies_msecs(chan->dfs_state_entered);
- if (nla_put_flag(msg, NL80211_FREQUENCY_ATTR_RADAR))
- goto nla_put_failure;
- if (nla_put_u32(msg, NL80211_FREQUENCY_ATTR_DFS_STATE,
- chan->dfs_state))
- goto nla_put_failure;
- if (nla_put_u32(msg, NL80211_FREQUENCY_ATTR_DFS_TIME, time))
- goto nla_put_failure;
- }
+ if ((chan->flags & IEEE80211_CHAN_RADAR) &&
+ nla_put_flag(msg, NL80211_FREQUENCY_ATTR_RADAR))
+ goto nla_put_failure;
if ((chan->flags & IEEE80211_CHAN_NO_HT40MINUS) &&
nla_put_flag(msg, NL80211_FREQUENCY_ATTR_NO_HT40_MINUS))
goto nla_put_failure;
--
1.8.0

2013-02-19 11:10:27

by Johannes Berg

Subject: Re: [PATCH 3.9] nl80211: remove radar channel information

On Mon, 2013-02-18 at 23:49 +0100, Johannes Berg wrote:
> From: Johannes Berg <[email protected]>
>
> The wiphy information is getting very close to being too
> much for a typical netlink dump message, and adding the
> two radar attributes to a number of channels can push it
> over the limit, which means userspace gets no information
> at all. Therefore, revert it for now. We're working on a
> solution that will allow userspace to request splitting
> the information across multiple netlink messages, which
> will allow us to add this back.

Applied.

johannes