From: Johannes Berg Date: Thu, 28 Jun 2012 11:45:58 +0000 (+0200) Subject: Merge remote-tracking branch 'wireless-next/master' into mac80211-next X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=b1fbd46976d047a6d6767872a9112afaa914fd82;p=linux-beck.git Merge remote-tracking branch 'wireless-next/master' into mac80211-next --- b1fbd46976d047a6d6767872a9112afaa914fd82 diff --cc drivers/net/wireless/ath/ath6kl/cfg80211.c index b8fce0d4d72e,fd7dbd4609df..aca1d2689e90 --- a/drivers/net/wireless/ath/ath6kl/cfg80211.c +++ b/drivers/net/wireless/ath/ath6kl/cfg80211.c @@@ -3497,9 -3636,8 +3637,9 @@@ int ath6kl_cfg80211_init(struct ath6kl wiphy->wowlan.n_patterns = WOW_MAX_FILTERS_PER_LIST; wiphy->wowlan.pattern_min_len = 1; wiphy->wowlan.pattern_max_len = WOW_PATTERN_SIZE; +#endif - wiphy->max_sched_scan_ssids = MAX_PROBED_SSID_INDEX; + wiphy->max_sched_scan_ssids = MAX_PROBED_SSIDS; ar->wiphy->flags |= WIPHY_FLAG_SUPPORTS_FW_ROAM | WIPHY_FLAG_HAVE_AP_SME |