---

yaml
---
r: 266235
b: refs/heads/master
c: 221737d
h: refs/heads/master
i:
  266233: 5f212ef
  266231: 567df15
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: fb55377b2aa9464b773e8688a135d5b4c6aa91fa
+refs/heads/master: 221737d24f884f3f829e7f94d24fc4cc6d0f7b41

trunk/drivers/net/wireless/wl12xx/main.c

@@ -266,8 +266,8 @@ static struct conf_drv_settings default_conf = {
 	},
 	.sched_scan = {
 		/* sched_scan requires dwell times in TU instead of TU/1000 */
-		.min_dwell_time_active = 8,
-		.max_dwell_time_active = 30,
+		.min_dwell_time_active = 30,
+		.max_dwell_time_active = 60,
 		.dwell_time_passive    = 100,
 		.dwell_time_dfs        = 150,
 		.num_probe_reqs        = 2,
@@ -4503,7 +4503,8 @@ int wl1271_init_ieee80211(struct wl1271 *wl)
 	wl->hw->wiphy->interface_modes = BIT(NL80211_IFTYPE_STATION) |
 		BIT(NL80211_IFTYPE_ADHOC) | BIT(NL80211_IFTYPE_AP);
 	wl->hw->wiphy->max_scan_ssids = 1;
-	wl->hw->wiphy->max_sched_scan_ssids = 8;
+	wl->hw->wiphy->max_sched_scan_ssids = 16;
+	wl->hw->wiphy->max_match_sets = 16;
 	/*
 	 * Maximum length of elements in scanning probe request templates
 	 * should be the maximum length possible for a template, without