From 1c6410764b8fa61d569e31aa859a67c5093e99b9 Mon Sep 17 00:00:00 2001
From: Jouni Malinen <jouni@qca.qualcomm.com>
Date: Tue, 30 Aug 2011 21:57:59 +0300
Subject: [PATCH] --- yaml --- r: 266559 b: refs/heads/master c:
 b84da8c738681b96e7691d985191ebf9ee4a21e8 h: refs/heads/master i:   266557:
 19b8423d1ffa54235e81b8aea62077edb4a2d6d6   266555:
 9321cd2d8f49e1dfb2e3756b8b811a7be05ee3b8   266551:
 0ea422a63e7b9d54bb0bd64b54d6833a6e4cc420   266543:
 b7322a65defde5f27cab8c161a0a309717726eb2   266527:
 d0c626cde682887cd07ab8c68f40e6ab994c3818   266495:
 972db117d9635adebc8f2bd7cb22c83faece338b v: v3

---
 [refs]                                           |  2 +-
 trunk/drivers/net/wireless/ath/ath6kl/cfg80211.c | 11 +++++++++++
 trunk/drivers/net/wireless/ath/ath6kl/wmi.h      |  3 +++
 3 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 7c6c65afdb84..72423beb1818 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f9e5f05cb9c944696def27618215216df59c7c33
+refs/heads/master: b84da8c738681b96e7691d985191ebf9ee4a21e8
diff --git a/trunk/drivers/net/wireless/ath/ath6kl/cfg80211.c b/trunk/drivers/net/wireless/ath/ath6kl/cfg80211.c
index 5c98de36d163..56a60c7f53c1 100644
--- a/trunk/drivers/net/wireless/ath/ath6kl/cfg80211.c
+++ b/trunk/drivers/net/wireless/ath/ath6kl/cfg80211.c
@@ -776,6 +776,16 @@ static int ath6kl_cfg80211_scan(struct wiphy *wiphy, struct net_device *ndev,
 						  request->ssids[i].ssid);
 	}
 
+	if (request->ie) {
+		ret = ath6kl_wmi_set_appie_cmd(ar->wmi, WMI_FRAME_PROBE_REQ,
+					       request->ie, request->ie_len);
+		if (ret) {
+			ath6kl_err("failed to set Probe Request appie for "
+				   "scan");
+			return ret;
+		}
+	}
+
 	if (ath6kl_wmi_startscan_cmd(ar->wmi, WMI_LONG_SCAN, 0,
 				     false, 0, 0, 0, NULL) != 0) {
 		ath6kl_err("wmi_startscan_cmd failed\n");
@@ -1770,6 +1780,7 @@ struct wireless_dev *ath6kl_cfg80211_init(struct device *dev)
 	    BIT(NL80211_IFTYPE_ADHOC);
 	/* max num of ssids that can be probed during scanning */
 	wdev->wiphy->max_scan_ssids = MAX_PROBED_SSID_INDEX;
+	wdev->wiphy->max_scan_ie_len = 1000; /* FIX: what is correct limit? */
 	wdev->wiphy->bands[IEEE80211_BAND_2GHZ] = &ath6kl_band_2ghz;
 	wdev->wiphy->bands[IEEE80211_BAND_5GHZ] = &ath6kl_band_5ghz;
 	wdev->wiphy->signal_type = CFG80211_SIGNAL_TYPE_MBM;
diff --git a/trunk/drivers/net/wireless/ath/ath6kl/wmi.h b/trunk/drivers/net/wireless/ath/ath6kl/wmi.h
index 5e2f6ce41ba1..83af518fcafc 100644
--- a/trunk/drivers/net/wireless/ath/ath6kl/wmi.h
+++ b/trunk/drivers/net/wireless/ath/ath6kl/wmi.h
@@ -2218,6 +2218,9 @@ int ath6kl_wmi_info_req_cmd(struct wmi *wmi, u32 info_req_flags);
 
 int ath6kl_wmi_cancel_remain_on_chnl_cmd(struct wmi *wmi);
 
+int ath6kl_wmi_set_appie_cmd(struct wmi *wmi, u8 mgmt_frm_type, const u8 *ie,
+			     u8 ie_len);
+
 void *ath6kl_wmi_init(struct ath6kl *devt);
 void ath6kl_wmi_shutdown(struct wmi *wmi);