From: Johannes Berg <johannes.berg@intel.com>
Date: Tue, 23 Apr 2013 14:19:20 +0000 (+0300)
Subject: nl80211: Fix nla_nest_start conversion
X-Git-Tag: aosp-kk-from-upstream~353
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=adc96dc2ad3b9eeeb79ea817dd00f01b97f4073a;p=thirdparty%2Fhostap.git

nl80211: Fix nla_nest_start conversion

Dmitry reported that the kernel could no longer parse the
scheduled scan attributes correctly after my patch to use
nla_nest_start/nla_nest_end. The reason is that the wrong
attribute is closed I accidentally made it close the full
scan config instead of just the SSID match set.

Reported-by: Dmitry Shmidt <dimitrysh@google.com>
Signed-hostap: Johannes Berg <johannes.berg@intel.com>
---

diff --git a/src/drivers/driver_nl80211.c b/src/drivers/driver_nl80211.c
index b53e7066a..3b0dba4cd 100644
--- a/src/drivers/driver_nl80211.c
+++ b/src/drivers/driver_nl80211.c
@@ -4004,7 +4004,7 @@ static int wpa_driver_nl80211_sched_scan(void *priv,
 				drv->filter_ssids[i].ssid_len,
 				drv->filter_ssids[i].ssid);
 
-			nla_nest_end(msg, match_sets);
+			nla_nest_end(msg, match_set_ssid);
 		}
 
 		if (params->filter_rssi) {