Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1c33a059 authored by Johannes Berg's avatar Johannes Berg
Browse files

nl80211: remove radar information 



The wiphy information is getting very close to being too
much for a typical netlink dump message and adding the
radar attributes to channels and interface combinations
can push it over the limit, which means userspace gets no
information whatsoever. Therefore, remove these again for
now, no driver actually supports radar detection anyway
and a modified userspace is required as well.

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 <simon.wunderlich@s2003.tu-chemnitz.de>
Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
parent 1b91731d

net/wireless/nl80211.c

+3 −13
Original line number Diff line number Diff line
@@ -554,16 +554,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))

	if ((chan->flags & IEEE80211_CHAN_RADAR) &&

	    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_NO_HT40MINUS) &&

	    nla_put_flag(msg, NL80211_FREQUENCY_ATTR_NO_HT40_MINUS))

		goto nla_put_failure;
@@ -900,9 +893,6 @@ static int nl80211_put_iface_combinations(struct wiphy *wiphy, 
		    nla_put_u32(msg, NL80211_IFACE_COMB_MAXNUM,

				c->max_interfaces))

			goto nla_put_failure;

		if (nla_put_u32(msg, NL80211_IFACE_COMB_RADAR_DETECT_WIDTHS,

				c->radar_detect_widths))

			goto nla_put_failure;



		nla_nest_end(msg, nl_combi);

	}