aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/ti
diff options
context:
space:
mode:
authorJohannes Berg <johannes.berg@intel.com>2013-08-21 05:24:01 -0400
committerJohannes Berg <johannes.berg@intel.com>2013-08-23 06:02:26 -0400
commit1fb9026000e66ffe032b11ec724c1bc7d068198e (patch)
tree64eab50157e6e53ee467d8685576f51294e76a66 /drivers/net/wireless/ti
parente133fae263090f5795b8024a4024b81e06770132 (diff)
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>
Diffstat (limited to 'drivers/net/wireless/ti')
-rw-r--r--drivers/net/wireless/ti/wlcore/main.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/net/wireless/ti/wlcore/main.c b/drivers/net/wireless/ti/wlcore/main.c
index d1b19c38a907..38995f90040d 100644
--- a/drivers/net/wireless/ti/wlcore/main.c
+++ b/drivers/net/wireless/ti/wlcore/main.c
@@ -5623,7 +5623,8 @@ static int wl1271_init_ieee80211(struct wl1271 *wl)
5623 wl->hw->wiphy->max_remain_on_channel_duration = 5000; 5623 wl->hw->wiphy->max_remain_on_channel_duration = 5000;
5624 5624
5625 wl->hw->wiphy->flags |= WIPHY_FLAG_AP_UAPSD | 5625 wl->hw->wiphy->flags |= WIPHY_FLAG_AP_UAPSD |
5626 WIPHY_FLAG_HAS_REMAIN_ON_CHANNEL; 5626 WIPHY_FLAG_HAS_REMAIN_ON_CHANNEL |
5627 WIPHY_FLAG_SUPPORTS_SCHED_SCAN;
5627 5628
5628 /* make sure all our channels fit in the scanned_ch bitmask */ 5629 /* make sure all our channels fit in the scanned_ch bitmask */
5629 BUILD_BUG_ON(ARRAY_SIZE(wl1271_channels) + 5630 BUILD_BUG_ON(ARRAY_SIZE(wl1271_channels) +