From a0fcf9ce072671b08d0d8301d5f03daf0c142742 Mon Sep 17 00:00:00 2001
From: Jouni Malinen <j@w1.fi>
Date: Wed, 27 Oct 2010 13:40:33 +0300
Subject: [PATCH] --- yaml --- r: 220962 b: refs/heads/master c:
 dc9f48ce7c7d345be31208def51572a8250a4a03 h: refs/heads/master v: v3

---
 [refs]                    | 2 +-
 trunk/net/mac80211/main.c | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index bcf4c4acea04..a9ff0403918e 100644
--- 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
index 6b322fa681f5..107a0cbe52ac 100644
--- 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);