---

yaml --- r: 220962 b: refs/heads/master c: dc9f48c h: refs/heads/master v: v3
git-mirror · Oct 27, 2010 · a0fcf9c · a0fcf9c
1 parent 761d469
commit a0fcf9c
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d654567dec75782d6fd9add4b7b9c50e0926d369
+refs/heads/master: dc9f48ce7c7d345be31208def51572a8250a4a03
diff --git a/trunk/net/mac80211/main.c b/trunk/net/mac80211/main.c
@@ -677,10 +677,11 @@ int ieee80211_register_hw(struct ieee80211_hw *hw)
 	/*
 	 * Calculate scan IE length -- we need this to alloc
 	 * memory and to subtract from the driver limit. It
-	 * includes the (extended) supported rates and HT
+	 * includes the DS Params, (extended) supported rates, and HT
 	 * information -- SSID is the driver's responsibility.
 	 */
-	local->scan_ies_len = 4 + max_bitrates; /* (ext) supp rates */
+	local->scan_ies_len = 4 + max_bitrates /* (ext) supp rates */ +
+		3 /* DS Params */;
 	if (supp_ht)
 		local->scan_ies_len += 2 + sizeof(struct ieee80211_ht_cap);