---

yaml --- r: 315537 b: refs/heads/master c: d811b3d h: refs/heads/master i: 315535: 0db0a77 v: v3
git-mirror · Jul 12, 2012 · 21d7e4b · 21d7e4b
1 parent 0cc0483
commit 21d7e4b
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: fd0142844efa85d89017c89227a0f03de1eee327
+refs/heads/master: d811b3d5566f1441b321a1219c260124b209e0bd
diff --git a/trunk/net/mac80211/scan.c b/trunk/net/mac80211/scan.c
@@ -928,6 +928,9 @@ int ieee80211_request_sched_scan_start(struct ieee80211_sub_if_data *sdata,
 	}
 
 	for (i = 0; i < IEEE80211_NUM_BANDS; i++) {
+		if (!local->hw.wiphy->bands[i])
+			continue;
+
 		local->sched_scan_ies.ie[i] = kzalloc(2 +
 						      IEEE80211_MAX_SSID_LEN +
 						      local->scan_ies_len +

diff --git a/trunk/net/mac80211/util.c b/trunk/net/mac80211/util.c
@@ -999,6 +999,8 @@ int ieee80211_build_preq_ies(struct ieee80211_local *local, u8 *buffer,
 	int ext_rates_len;
 
 	sband = local->hw.wiphy->bands[band];
+	if (WARN_ON_ONCE(!sband))
+		return 0;
 
 	pos = buffer;