X-Git-Url: http://www.project-moonshot.org/gitweb/?a=blobdiff_plain;f=src%2Fdrivers%2Fdriver_atheros.c;h=27107aa14210265750f1ae0fadb9e5f06ec8d594;hb=12970f8a5798870b1f7f1c9958f1780921b04232;hp=5c25f00b16431f5b8bcfe208611bc4de0e18edc0;hpb=702934a163ce726c6d7309d0a5ad39009b0b4d1e;p=libeap.git

diff --git a/src/drivers/driver_atheros.c b/src/drivers/driver_atheros.c
index 5c25f00..27107aa 100644
--- a/src/drivers/driver_atheros.c
+++ b/src/drivers/driver_atheros.c
@@ -737,7 +737,7 @@ static int
 madwifi_set_wps_ie(void *priv, const u8 *ie, size_t len, u32 frametype)
 {
 	struct madwifi_driver_data *drv = priv;
-	u8 buf[256];
+	u8 buf[500];
 	struct ieee80211req_getset_appiebuf *beac_ie;
 
 	wpa_printf(MSG_DEBUG, "%s buflen = %lu", __func__,
@@ -754,8 +754,12 @@ madwifi_set_wps_ie(void *priv, const u8 *ie, size_t len, u32 frametype)
 
 static int
 madwifi_set_ap_wps_ie(void *priv, const struct wpabuf *beacon,
-		      const struct wpabuf *proberesp)
+		      const struct wpabuf *proberesp,
+		      const struct wpabuf *assocresp)
 {
+	madwifi_set_wps_ie(priv, assocresp ? wpabuf_head(assocresp) : NULL,
+			   assocresp ? wpabuf_len(assocresp) : 0,
+			   IEEE80211_APPIE_FRAME_ASSOC_RESP);
 	if (madwifi_set_wps_ie(priv, beacon ? wpabuf_head(beacon) : NULL,
 			       beacon ? wpabuf_len(beacon) : 0,
 			       IEEE80211_APPIE_FRAME_BEACON))
@@ -795,6 +799,10 @@ madwifi_new_sta(struct madwifi_driver_data *drv, u8 addr[IEEE80211_ADDR_LEN])
 		    ie.wpa_ie, IEEE80211_MAX_OPT_IE);
 	wpa_hexdump(MSG_MSGDUMP, "madwifi req RSN IE",
 		    ie.rsn_ie, IEEE80211_MAX_OPT_IE);
+#ifdef ATH_WPS_IE
+	wpa_hexdump(MSG_MSGDUMP, "madwifi req WPS IE",
+		    ie.wps_ie, IEEE80211_MAX_OPT_IE);
+#endif /* ATH_WPS_IE */
 	iebuf = ie.wpa_ie;
 	/* madwifi seems to return some random data if WPA/RSN IE is not set.
 	 * Assume the IE was not included if the IE type is unknown. */
@@ -809,6 +817,16 @@ madwifi_new_sta(struct madwifi_driver_data *drv, u8 addr[IEEE80211_ADDR_LEN])
 	}
 
 	ielen = iebuf[1];
+
+#ifdef ATH_WPS_IE
+	/* if WPS IE is present, preference is given to WPS */
+	if (ie.wps_ie &&
+	    (ie.wps_ie[1] > 0 && (ie.wps_ie[0] == WLAN_EID_VENDOR_SPECIFIC))) {
+		iebuf = ie.wps_ie;
+		ielen = ie.wps_ie[1];
+	}
+#endif /* ATH_WPS_IE */
+
 	if (ielen == 0)
 		iebuf = NULL;
 	else