commit d30615510a4f6028659ce00ed2ba86dfe646085a
author Linux Build Service Account <lnxbuild@localhost> Sun Mar 18 06:55:55 2012 -0700
committer QuIC Gerrit Code Review <code-review@localhost> Sun Mar 18 06:55:55 2012 -0700
tree c2d15f4c8eebe5492e42e2b006f7c02df813ab09
parent 22a5fd9a029e605247894759ea29ea1b7e859509
parent ae86f14f2d4491a659472940e5e919af1b4afc94

Merge "net/wireless: Check for number of sub bands" into msm-3.0

net/wireless/nl80211.c

diff --git a/net/wireless/nl80211.c b/net/wireless/nl80211.c
index c92906c..ef59862 100644
--- a/net/wireless/nl80211.c
+++ b/net/wireless/nl80211.c
@@ -3508,7 +3508,9 @@
 		       request->ie_len);
 	}
 	for (i = 0; i < IEEE80211_NUM_BANDS; i++)
-		request->rates[i] = (1 << wiphy->bands[i]->n_bitrates) - 1;
+		if (wiphy->bands[i])
+			request->rates[i] =
+				(1 << wiphy->bands[i]->n_bitrates) - 1;
 	if (info->attrs[NL80211_ATTR_SCAN_SUPP_RATES]) {
 		nla_for_each_nested(attr,
 				    info->attrs[NL80211_ATTR_SCAN_SUPP_RATES],