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

Commit 1fb90260 authored Aug 21, 2013 by Johannes Berg

mac80211: move setting WIPHY_FLAG_SUPPORTS_SCHED_SCAN into drivers



mac80211 currently sets WIPHY_FLAG_SUPPORTS_SCHED_SCAN based on whether
the start_sched_scan operation is supported or not, but that will not
be correct for all drivers, we're adding scheduled scan to the iwlmvm
driver but it depends on firmware support.

Therefore, move setting WIPHY_FLAG_SUPPORTS_SCHED_SCAN into the drivers
so that they can control it regardless of implementing the operation.

This currently only affects the TI drivers since they're the only ones
implementing scheduled scan (in a mac80211 driver.)

Acked-by: Luciano Coelho <luca@coelho.fi>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>

parent e133fae2

drivers/net/wireless/ti/wlcore/main.c

+2 −1

Original line number	Diff line number	Diff line
		@@ -5623,7 +5623,8 @@ static int wl1271_init_ieee80211(struct wl1271 *wl)
		wl->hw->wiphy->max_remain_on_channel_duration = 5000;

		wl->hw->wiphy->flags \|= WIPHY_FLAG_AP_UAPSD \|
		WIPHY_FLAG_HAS_REMAIN_ON_CHANNEL;
		WIPHY_FLAG_HAS_REMAIN_ON_CHANNEL \|
		WIPHY_FLAG_SUPPORTS_SCHED_SCAN;

		/* make sure all our channels fit in the scanned_ch bitmask */
		BUILD_BUG_ON(ARRAY_SIZE(wl1271_channels) +

net/mac80211/main.c

+0 −3

Original line number	Diff line number	Diff line
		@@ -892,9 +892,6 @@ int ieee80211_register_hw(struct ieee80211_hw *hw)
		if (!local->ops->remain_on_channel)
		local->hw.wiphy->max_remain_on_channel_duration = 5000;

		if (local->ops->sched_scan_start)
		local->hw.wiphy->flags \|= WIPHY_FLAG_SUPPORTS_SCHED_SCAN;

		/* mac80211 based drivers don't support internal TDLS setup */
		if (local->hw.wiphy->flags & WIPHY_FLAG_SUPPORTS_TDLS)
		local->hw.wiphy->flags \|= WIPHY_FLAG_TDLS_EXTERNAL_SETUP;