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

Commit 97dc94f1 authored Jun 25, 2014 by Michal Kazior Committed by Johannes Berg Jun 25, 2014

cfg80211: remove channel_switch combination check



Driver is now responsible for veryfing if the
switch is possible.

Since this is inherently tricky driver may decide
to disconnect an interface later with
cfg80211_stop_iface().

This doesn't mean driver can accept everything. It
should do it's best to verify requests and reject
them as soon as possible.

Signed-off-by: Michal Kazior <michal.kazior@tieto.com>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>

parent 4c3ebc56

include/net/cfg80211.h

+6 −1

Original line number	Diff line number	Diff line
		@@ -2301,7 +2301,12 @@ struct cfg80211_qos_map {
		* reliability. This operation can not fail.
		* @set_coalesce: Set coalesce parameters.
		*
		* @channel_switch: initiate channel-switch procedure (with CSA)
		* @channel_switch: initiate channel-switch procedure (with CSA). Driver is
		* responsible for veryfing if the switch is possible. Since this is
		* inherently tricky driver may decide to disconnect an interface later
		* with cfg80211_stop_iface(). This doesn't mean driver can accept
		* everything. It should do it's best to verify requests and reject them
		* as soon as possible.
		*
		* @set_qos_map: Set QoS mapping information to the driver
		*

net/wireless/nl80211.c

+0 −11

Original line number	Diff line number	Diff line
		@@ -6013,17 +6013,6 @@ static int nl80211_channel_switch(struct sk_buff skb, struct genl_info info)
		params.radar_required = true;
		}

		/* TODO: I left this here for now. With channel switch, the
		* verification is a bit more complicated, because we only do
		* it later when the channel switch really happens.
		*/
		err = cfg80211_can_use_iftype_chan(rdev, wdev, wdev->iftype,
		params.chandef.chan,
		CHAN_MODE_SHARED,
		radar_detect_width);
		if (err)
		return err;

		if (info->attrs[NL80211_ATTR_CH_SWITCH_BLOCK_TX])
		params.block_tx = true;