hostapd: add a build variant for wpa_supplicant and one for a multicall hostapd+supplicant program (wpad) and remove the old wpa_supplicant package

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@19286 3c298f89-4303-0410-b956-a3cf2f4a3e73

6 files changed, 0 insertions, 561 deletions

diff --git a/package/wpa_supplicant/patches/100-timestamp_check.patch b/package/wpa_supplicant/patches/100-timestamp_check.patch
deleted file mode 100644
index 98fdbbc1be..0000000000
--- a/package/wpa_supplicant/patches/100-timestamp_check.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- a/src/tls/x509v3.c
-+++ b/src/tls/x509v3.c
-@@ -1591,8 +1591,11 @@ int x509_certificate_chain_validate(stru
- 		if (chain_trusted)
- 			continue;
- 
--		if ((unsigned long) now.sec <
-+		if (
-+#ifndef NO_TIMESTAMP_CHECK
-+		    (unsigned long) now.sec <
- 		    (unsigned long) cert->not_before ||
-+#endif
- 		    (unsigned long) now.sec >
- 		    (unsigned long) cert->not_after) {
- 			wpa_printf(MSG_INFO, "X509: Certificate not valid "
diff --git a/package/wpa_supplicant/patches/110-roaming.patch b/package/wpa_supplicant/patches/110-roaming.patch
deleted file mode 100644
index 077c2e56b3..0000000000
--- a/package/wpa_supplicant/patches/110-roaming.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-This patch decreases the timeouts for assoc/auth to more realistic values. Improves roaming speed
---- a/wpa_supplicant/events.c
-+++ b/wpa_supplicant/events.c
-@@ -854,7 +854,7 @@ static void wpa_supplicant_event_assoc(s
- 		wpa_supplicant_set_state(wpa_s, WPA_COMPLETED);
- 	} else if (!ft_completed) {
- 		/* Timeout for receiving the first EAPOL packet */
--		wpa_supplicant_req_auth_timeout(wpa_s, 10, 0);
-+		wpa_supplicant_req_auth_timeout(wpa_s, 3, 0);
- 	}
- 	wpa_supplicant_cancel_scan(wpa_s);
- 
---- a/wpa_supplicant/scan.c
-+++ b/wpa_supplicant/scan.c
-@@ -189,6 +189,7 @@ static void wpa_supplicant_scan(void *el
- 	}
- #endif /* CONFIG_WPS */
- 
-+	wpa_drv_flush_pmkid(wpa_s);
- 	if (wpa_s->use_client_mlme) {
- 		ieee80211_sta_set_probe_req_ie(wpa_s, extra_ie, extra_ie_len);
- 		ret = ieee80211_sta_req_scan(wpa_s, ssid ? ssid->ssid : NULL,
-@@ -203,7 +204,7 @@ static void wpa_supplicant_scan(void *el
- 
- 	if (ret) {
- 		wpa_printf(MSG_WARNING, "Failed to initiate AP scan.");
--		wpa_supplicant_req_scan(wpa_s, 10, 0);
-+		wpa_supplicant_req_scan(wpa_s, 3, 0);
- 	} else
- 		wpa_s->scan_runs++;
- }
---- a/wpa_supplicant/wpa_supplicant.c
-+++ b/wpa_supplicant/wpa_supplicant.c
-@@ -1160,10 +1160,10 @@ void wpa_supplicant_associate(struct wpa
- 
- 		if (assoc_failed) {
- 			/* give IBSS a bit more time */
-- 			timeout = ssid->mode ? 10 : 5;
-+ 			timeout = ssid->mode ? 5 : 2;
- 		} else if (wpa_s->conf->ap_scan == 1) {
- 			/* give IBSS a bit more time */
-- 			timeout = ssid->mode ? 20 : 10;
-+ 			timeout = ssid->mode ? 7 : 3;
- 		}
- 		wpa_supplicant_req_auth_timeout(wpa_s, timeout, 0);
- 	}
diff --git a/package/wpa_supplicant/patches/120-ssid_scan.patch b/package/wpa_supplicant/patches/120-ssid_scan.patch
deleted file mode 100644
index 6beaed449c..0000000000
--- a/package/wpa_supplicant/patches/120-ssid_scan.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-Don't do broadcast SSID scans, if all configured SSIDs use scan_ssid=1. Improves background scanning in supplicant-managed roaming.
-
---- a/wpa_supplicant/scan.c
-+++ b/wpa_supplicant/scan.c
-@@ -73,6 +73,7 @@ static void wpa_supplicant_scan(void *el
- 	struct wpabuf *wps_ie = NULL;
- 	const u8 *extra_ie = NULL;
- 	size_t extra_ie_len = 0;
-+	int scan_ssid_all = 1;
- 	int wps = 0;
- #ifdef CONFIG_WPS
- 	enum wps_request_type req_type = WPS_REQ_ENROLLEE_INFO;
-@@ -82,6 +83,17 @@ static void wpa_supplicant_scan(void *el
- 		return;
- 
- 	enabled = 0;
-+
-+	/* check if all configured ssids should be scanned directly */
-+	ssid = wpa_s->conf->ssid;
-+	while (ssid) {
-+		if (!ssid->scan_ssid) {
-+			scan_ssid_all = 0;
-+			break;
-+		}
-+		ssid = ssid->next;
-+	}
-+
- 	ssid = wpa_s->conf->ssid;
- 	while (ssid) {
- 		if (!ssid->disabled) {
-@@ -154,6 +166,10 @@ static void wpa_supplicant_scan(void *el
- 		return;
- 	}
- 
-+	if (scan_ssid_all && !ssid) {
-+		ssid = wpa_s->conf->ssid;
-+	}
-+
- 	wpa_printf(MSG_DEBUG, "Starting AP scan (%s SSID)",
- 		   ssid ? "specific": "broadcast");
- 	if (ssid) {
diff --git a/package/wpa_supplicant/patches/130-scanning.patch b/package/wpa_supplicant/patches/130-scanning.patch
deleted file mode 100644
index aad4450f7d..0000000000
--- a/package/wpa_supplicant/patches/130-scanning.patch
+++ /dev/null
@@ -1,175 +0,0 @@
-Add a scan result cache to improve roaming speed if the driver gave us a background scan before losing the connection.
-
---- a/wpa_supplicant/config.h
-+++ b/wpa_supplicant/config.h
-@@ -97,6 +97,12 @@ struct wpa_config {
- 	int ap_scan;
- 
- 	/**
-+	 * scan_cache - controls the time in seconds after the last scan results
-+	 * before a new scan may be initiated
-+	 */
-+	int scan_cache;
-+
-+	/**
- 	 * ctrl_interface - Parameters for the control interface
- 	 *
- 	 * If this is specified, %wpa_supplicant will open a control interface
---- a/wpa_supplicant/config_file.c
-+++ b/wpa_supplicant/config_file.c
-@@ -306,6 +306,13 @@ static int wpa_config_parse_int(const st
- 	return 0;
- }
- 
-+static int wpa_config_process_scan_cache(struct wpa_config *config, char *pos)
-+{
-+	config->scan_cache = atoi(pos);
-+	wpa_printf(MSG_DEBUG, "scan_cache=%d", config->scan_cache);
-+	return 0;
-+}
-+
- 
- static int wpa_config_parse_str(const struct global_parse_data *data,
- 				struct wpa_config *config, int line,
-@@ -433,6 +440,7 @@ static const struct global_parse_data gl
- #endif /* CONFIG_CTRL_IFACE */
- 	{ INT_RANGE(eapol_version, 1, 2) },
- 	{ INT(ap_scan) },
-+	{ INT(scan_cache) },
- 	{ INT(fast_reauth) },
- #ifdef EAP_TLS_OPENSSL
- 	{ STR(opensc_engine_path) },
-@@ -835,6 +843,8 @@ static void wpa_config_write_global(FILE
- 		fprintf(f, "eapol_version=%d\n", config->eapol_version);
- 	if (config->ap_scan != DEFAULT_AP_SCAN)
- 		fprintf(f, "ap_scan=%d\n", config->ap_scan);
-+	if (config->scan_cache != 0)
-+		fprintf(f, "scan_cache=%d\n", config->scan_cache);
- 	if (config->fast_reauth != DEFAULT_FAST_REAUTH)
- 		fprintf(f, "fast_reauth=%d\n", config->fast_reauth);
- #ifdef EAP_TLS_OPENSSL
---- a/wpa_supplicant/events.c
-+++ b/wpa_supplicant/events.c
-@@ -541,7 +541,7 @@ wpa_supplicant_select_bss_non_wpa(struct
- 					   "BSSID mismatch");
- 				continue;
- 			}
--			
-+
- 			if (!(ssid->key_mgmt & WPA_KEY_MGMT_NONE) &&
- 			    !(ssid->key_mgmt & WPA_KEY_MGMT_WPS) &&
- 			    !(ssid->key_mgmt & WPA_KEY_MGMT_IEEE8021X_NO_WPA))
-@@ -551,7 +551,7 @@ wpa_supplicant_select_bss_non_wpa(struct
- 				continue;
- 			}
- 
--			if ((ssid->key_mgmt & 
-+			if ((ssid->key_mgmt &
- 			     (WPA_KEY_MGMT_IEEE8021X | WPA_KEY_MGMT_PSK |
- 			      WPA_KEY_MGMT_FT_IEEE8021X | WPA_KEY_MGMT_FT_PSK |
- 			      WPA_KEY_MGMT_IEEE8021X_SHA256 |
-@@ -640,6 +640,9 @@ static void wpa_supplicant_event_scan_re
- 	    wpa_s->disconnected)
- 		return;
- 
-+	if (wpa_s->wpa_state > WPA_ASSOCIATED)
-+		goto done;
-+
- 	while (selected == NULL) {
- 		for (prio = 0; prio < wpa_s->conf->num_prio; prio++) {
- 			selected = wpa_supplicant_select_bss(
-@@ -652,6 +655,7 @@ static void wpa_supplicant_event_scan_re
- 			wpa_printf(MSG_DEBUG, "No APs found - clear blacklist "
- 				   "and try again");
- 			wpa_blacklist_clear(wpa_s);
-+ 			memset(&wpa_s->last_scan_results, 0, sizeof(wpa_s->last_scan_results));
- 			wpa_s->blacklist_cleared++;
- 		} else if (selected == NULL) {
- 			break;
-@@ -687,10 +691,12 @@ static void wpa_supplicant_event_scan_re
- 		rsn_preauth_scan_results(wpa_s->wpa, wpa_s->scan_res);
- 	} else {
- 		wpa_printf(MSG_DEBUG, "No suitable AP found.");
--		timeout = 5;
-+		timeout = 0;
- 		goto req_scan;
- 	}
- 
-+done:
-+	os_get_time(&wpa_s->last_scan_results);
- 	return;
- 
- req_scan:
-@@ -894,6 +900,9 @@ static void wpa_supplicant_event_disasso
- 	}
- 	if (wpa_s->wpa_state >= WPA_ASSOCIATED)
- 		wpa_supplicant_req_scan(wpa_s, 0, 100000);
-+	else if (wpa_s->wpa_state == WPA_ASSOCIATING)
-+		wpa_supplicant_req_auth_timeout(wpa_s, 0, 100000);
-+
- 	bssid = wpa_s->bssid;
- 	if (is_zero_ether_addr(bssid))
- 		bssid = wpa_s->pending_bssid;
---- a/wpa_supplicant/wpa_supplicant_i.h
-+++ b/wpa_supplicant/wpa_supplicant_i.h
-@@ -350,6 +350,7 @@ struct wpa_supplicant {
- 	struct wpa_client_mlme mlme;
- 	int use_client_mlme;
- 	int driver_4way_handshake;
-+	struct os_time last_scan_results;
- 
- 	int pending_mic_error_report;
- 	int pending_mic_error_pairwise;
-@@ -405,6 +406,7 @@ int wpa_supplicant_scard_init(struct wpa
- 
- /* scan.c */
- void wpa_supplicant_req_scan(struct wpa_supplicant *wpa_s, int sec, int usec);
-+int wpa_supplicant_may_scan(struct wpa_supplicant *wpa_s);
- void wpa_supplicant_cancel_scan(struct wpa_supplicant *wpa_s);
- 
- /* events.c */
---- a/wpa_supplicant/scan.c
-+++ b/wpa_supplicant/scan.c
-@@ -40,6 +40,18 @@ static void wpa_supplicant_gen_assoc_eve
- 	wpa_supplicant_event(wpa_s, EVENT_ASSOC, &data);
- }
- 
-+int wpa_supplicant_may_scan(struct wpa_supplicant *wpa_s)
-+{
-+	struct os_time time;
-+
-+	if (wpa_s->conf->scan_cache > 0) {
-+		os_get_time(&time);
-+		time.sec -= wpa_s->conf->scan_cache;
-+		if (os_time_before(&time, &wpa_s->last_scan_results))
-+			return 0;
-+	}
-+	return 1;
-+}
- 
- #ifdef CONFIG_WPS
- static int wpas_wps_in_use(struct wpa_config *conf,
-@@ -183,8 +195,9 @@ static void wpa_supplicant_scan(void *el
- 	wps = wpas_wps_in_use(wpa_s->conf, &req_type);
- #endif /* CONFIG_WPS */
- 
--	if (wpa_s->scan_res_tried == 0 && wpa_s->conf->ap_scan == 1 &&
--	    !wpa_s->use_client_mlme && wps != 2) {
-+	if (!wpa_supplicant_may_scan(wpa_s) ||
-+	    (wpa_s->scan_res_tried == 0 && wpa_s->conf->ap_scan == 1 &&
-+	    !wpa_s->use_client_mlme && wps != 2)) {
- 		wpa_s->scan_res_tried++;
- 		wpa_s->scan_req = scan_req;
- 		wpa_printf(MSG_DEBUG, "Trying to get current scan results "
---- a/wpa_supplicant/wpa_supplicant.c
-+++ b/wpa_supplicant/wpa_supplicant.c
-@@ -1491,6 +1491,9 @@ void wpa_supplicant_rx_eapol(void *ctx, 
- {
- 	struct wpa_supplicant *wpa_s = ctx;
- 
-+	if (wpa_s->wpa_state < WPA_ASSOCIATING)
-+		return;
-+
- 	wpa_printf(MSG_DEBUG, "RX EAPOL from " MACSTR, MAC2STR(src_addr));
- 	wpa_hexdump(MSG_MSGDUMP, "RX EAPOL", buf, len);
- 
diff --git a/package/wpa_supplicant/patches/140-quality.patch b/package/wpa_supplicant/patches/140-quality.patch
deleted file mode 100644
index edb0b2693b..0000000000
--- a/package/wpa_supplicant/patches/140-quality.patch
+++ /dev/null
@@ -1,33 +0,0 @@
---- a/wpa_supplicant/wpa_supplicant.c
-+++ b/wpa_supplicant/wpa_supplicant.c
-@@ -1248,7 +1248,7 @@ static int wpa_supplicant_get_scan_resul
- {
- #define SCAN_AP_LIMIT 128
- 	struct wpa_scan_result *results;
--	int num, i;
-+	int num, i, j;
- 	struct wpa_scan_results *res;
- 
- 	results = os_malloc(SCAN_AP_LIMIT * sizeof(struct wpa_scan_result));
-@@ -1345,6 +1345,21 @@ static int wpa_supplicant_get_scan_resul
- 		res->res[res->num++] = r;
- 	}
- 
-+	/* sort scan results by quality */
-+	for(i = 0; i < num - 1; i++) {
-+		for(j = i + 1; j < num; j++) {
-+			struct wpa_scan_result tmp;
-+
-+			if (results[i].qual > results[j].qual)
-+				continue;
-+
-+			os_memcpy(&tmp, &results[i], sizeof(tmp));
-+			os_memcpy(&results[i], &results[j], sizeof(tmp));
-+			os_memcpy(&results[j], &tmp, sizeof(tmp));
-+		}
-+	}
-+
-+
- 	os_free(results);
- 	wpa_s->scan_res = res;
- 
diff --git a/package/wpa_supplicant/patches/150-Remove-PS3-gelic-legacy-wpa-support.patch b/package/wpa_supplicant/patches/150-Remove-PS3-gelic-legacy-wpa-support.patch
deleted file mode 100644
index 94559f1b32..0000000000
--- a/package/wpa_supplicant/patches/150-Remove-PS3-gelic-legacy-wpa-support.patch
+++ /dev/null
@@ -1,251 +0,0 @@
-From 67441c596f016f69c230eaa31ecb2272c6cbf4bf Mon Sep 17 00:00:00 2001
-From: Hamish Guthrie <hamish.guthrie@sonycom.com>
-Date: Wed, 6 Jan 2010 10:00:22 +0100
-Subject: [PATCH] Remove PS3 gelic legacy wpa support
-
-The ps3 wireless driver now supports wireless extensions. There is dedicated support code in wpa_supplicant for the old gelic wireless driver. The current gelic driver retains the old API with CONFIG_GELIC_WIRELESS_OLD_PSK_INTERFACE, which is being removed from the driver.
-
-Signed-off-by: Hamish Guthrie <hamish.guthrie@sonycom.com>
----
- src/drivers/driver_ps3.c |  186 ----------------------------------------------
- src/drivers/drivers.c    |    6 --
- wpa_supplicant/Makefile  |    6 --
- 3 files changed, 0 insertions(+), 198 deletions(-)
- delete mode 100644 src/drivers/driver_ps3.c
-
-diff --git a/src/drivers/driver_ps3.c b/src/drivers/driver_ps3.c
-deleted file mode 100644
-index fde3425..0000000
---- a/src/drivers/driver_ps3.c
-+++ /dev/null
-@@ -1,186 +0,0 @@
--/*
-- * WPA Supplicant - PS3 Linux wireless extension driver interface
-- * Copyright 2007, 2008 Sony Corporation
-- *
-- * This program is free software; you can redistribute it and/or modify
-- * it under the terms of the GNU General Public License version 2 as
-- * published by the Free Software Foundation.
-- *
-- * Alternatively, this software may be distributed under the terms of BSD
-- * license.
-- *
-- * See README and COPYING for more details.
-- */
--
--#include "includes.h"
--#include <sys/ioctl.h>
--#include "wireless_copy.h"
--#include "common.h"
--#include "wpa_common.h"
--#include "driver.h"
--#include "eloop.h"
--#include "driver_wext.h"
--#include "ieee802_11_defs.h"
--
--static int wpa_driver_ps3_set_wpa_key(struct wpa_driver_wext_data *drv,
--				struct wpa_driver_associate_params *params)
--{
--	int ret, i;
--	struct iwreq iwr;
--	char *buf, *str;
--
--	if (!params->psk && !params->passphrase) {
--		wpa_printf(MSG_INFO, "%s:no PSK error", __func__);
--		return -EINVAL;
--	}
--
--	os_memset(&iwr, 0, sizeof(iwr));
--	if (params->psk) {
--		/* includes null */
--		iwr.u.data.length = PMK_LEN * 2 + 1;
--		buf = os_malloc(iwr.u.data.length);
--		if (!buf)
--			return -ENOMEM;
--		str = buf;
--		for (i = 0; i < PMK_LEN; i++) {
--			str += snprintf(str, iwr.u.data.length - (str - buf),
--					"%02x", params->psk[i]);
--		}
--	} else if (params->passphrase) {
--		/* including quotations and null */
--		iwr.u.data.length = strlen(params->passphrase) + 3;
--		buf = os_malloc(iwr.u.data.length);
--		if (!buf)
--			return -ENOMEM;
--		buf[0] = '"';
--		os_memcpy(buf + 1, params->passphrase, iwr.u.data.length - 3);
--		buf[iwr.u.data.length - 2] = '"';
--		buf[iwr.u.data.length - 1] = '\0';
--	} else
--		return -EINVAL;
--	iwr.u.data.pointer = (caddr_t) buf;
--	os_strlcpy(iwr.ifr_name, drv->ifname, IFNAMSIZ);
--	ret = ioctl(drv->ioctl_sock, SIOCIWFIRSTPRIV, &iwr);
--	os_free(buf);
--
--	return ret;
--}
--
--static int wpa_driver_ps3_set_wep_keys(struct wpa_driver_wext_data *drv,
--				struct wpa_driver_associate_params *params)
--{
--	int ret, i;
--	struct iwreq iwr;
--
--	for (i = 0; i < 4; i++) {
--		os_memset(&iwr, 0, sizeof(iwr));
--		os_strlcpy(iwr.ifr_name, drv->ifname, IFNAMSIZ);
--		iwr.u.encoding.flags = i + 1;
--		if (params->wep_key_len[i]) {
--			iwr.u.encoding.pointer = (caddr_t) params->wep_key[i];
--			iwr.u.encoding.length = params->wep_key_len[i];
--		} else
--			iwr.u.encoding.flags = IW_ENCODE_NOKEY |
--				IW_ENCODE_DISABLED;
--
--		if (ioctl(drv->ioctl_sock, SIOCSIWENCODE, &iwr) < 0) {
--			perror("ioctl[SIOCSIWENCODE]");
--			ret = -1;
--		}
--	}
--	return ret;
--}
--
--static int wpa_driver_ps3_associate(void *priv,
--				    struct wpa_driver_associate_params *params)
--{
--	struct wpa_driver_wext_data *drv = priv;
--	int ret, value;
--
--	wpa_printf(MSG_DEBUG, "%s: <-", __func__);
--
--	/* clear BSSID */
--	if (!params->bssid &&
--	    wpa_driver_wext_set_bssid(drv, NULL) < 0)
--		ret = -1;
--
--	if (wpa_driver_wext_set_mode(drv, params->mode) < 0)
--		ret = -1;
--
--	if (params->wpa_ie == NULL || params->wpa_ie_len == 0)
--		value = IW_AUTH_WPA_VERSION_DISABLED;
--	else if (params->wpa_ie[0] == WLAN_EID_RSN)
--		value = IW_AUTH_WPA_VERSION_WPA2;
--	else
--		value = IW_AUTH_WPA_VERSION_WPA;
--	if (wpa_driver_wext_set_auth_param(drv,
--					   IW_AUTH_WPA_VERSION, value) < 0)
--		ret = -1;
--	value = wpa_driver_wext_cipher2wext(params->pairwise_suite);
--	if (wpa_driver_wext_set_auth_param(drv,
--					   IW_AUTH_CIPHER_PAIRWISE, value) < 0)
--		ret = -1;
--	value = wpa_driver_wext_cipher2wext(params->group_suite);
--	if (wpa_driver_wext_set_auth_param(drv,
--					   IW_AUTH_CIPHER_GROUP, value) < 0)
--		ret = -1;
--	value = wpa_driver_wext_keymgmt2wext(params->key_mgmt_suite);
--	if (wpa_driver_wext_set_auth_param(drv, IW_AUTH_KEY_MGMT, value) < 0)
--		ret = -1;
--
--	/* set selected BSSID */
--	if (params->bssid &&
--	    wpa_driver_wext_set_bssid(drv, params->bssid) < 0)
--		ret = -1;
--
--	switch (params->group_suite) {
--	case CIPHER_NONE:
--		ret = 0;
--		break;
--	case CIPHER_WEP40:
--	case CIPHER_WEP104:
--		ret = wpa_driver_ps3_set_wep_keys(drv, params);
--		break;
--	case CIPHER_TKIP:
--	case CIPHER_CCMP:
--		ret = wpa_driver_ps3_set_wpa_key(drv, params);
--		break;
--	}
--
--	/* start to associate */
--	ret = wpa_driver_wext_set_ssid(drv, params->ssid, params->ssid_len);
--
--	wpa_printf(MSG_DEBUG, "%s: ->", __func__);
--
--	return ret;
--}
--
--static int wpa_driver_ps3_get_capa(void *priv, struct wpa_driver_capa *capa)
--{
--	int ret;
--	wpa_printf(MSG_DEBUG, "%s:<-", __func__);
--
--	ret = wpa_driver_wext_get_capa(priv, capa);
--	if (ret) {
--		wpa_printf(MSG_INFO, "%s: base wext returns error %d",
--			   __func__, ret);
--		return ret;
--	}
--	/* PS3 hypervisor does association and 4way handshake by itself */
--	capa->flags |= WPA_DRIVER_FLAGS_4WAY_HANDSHAKE;
--	wpa_printf(MSG_DEBUG, "%s:->", __func__);
--	return 0;
--}
--
--const struct wpa_driver_ops wpa_driver_ps3_ops = {
--	.name = "ps3",
--	.desc = "PLAYSTATION3 Linux wireless extension driver",
--	.get_bssid = wpa_driver_wext_get_bssid,
--	.get_ssid = wpa_driver_wext_get_ssid,
--	.scan = wpa_driver_wext_scan,
--	.get_scan_results2 = wpa_driver_wext_get_scan_results,
--	.associate = wpa_driver_ps3_associate, /* PS3 */
--	.init = wpa_driver_wext_init,
--	.deinit = wpa_driver_wext_deinit,
--	.get_capa = wpa_driver_ps3_get_capa, /* PS3 */
--};
-diff --git a/src/drivers/drivers.c b/src/drivers/drivers.c
-index d278797..7e7d720 100644
---- a/src/drivers/drivers.c
-+++ b/src/drivers/drivers.c
-@@ -64,9 +64,6 @@ extern struct wpa_driver_ops wpa_driver_ralink_ops; /* driver_ralink.c */
- #ifdef CONFIG_DRIVER_OSX
- extern struct wpa_driver_ops wpa_driver_osx_ops; /* driver_osx.m */
- #endif /* CONFIG_DRIVER_OSX */
--#ifdef CONFIG_DRIVER_PS3
--extern struct wpa_driver_ops wpa_driver_ps3_ops; /* driver_ps3.c */
--#endif /* CONFIG_DRIVER_PS3 */
- #ifdef CONFIG_DRIVER_IPHONE
- extern struct wpa_driver_ops wpa_driver_iphone_ops; /* driver_iphone.m */
- #endif /* CONFIG_DRIVER_IPHONE */
-@@ -126,9 +123,6 @@ struct wpa_driver_ops *wpa_supplicant_drivers[] =
- #ifdef CONFIG_DRIVER_OSX
- 	&wpa_driver_osx_ops,
- #endif /* CONFIG_DRIVER_OSX */
--#ifdef CONFIG_DRIVER_PS3
--	&wpa_driver_ps3_ops,
--#endif /* CONFIG_DRIVER_PS3 */
- #ifdef CONFIG_DRIVER_IPHONE
- 	&wpa_driver_iphone_ops,
- #endif /* CONFIG_DRIVER_IPHONE */
-diff --git a/wpa_supplicant/Makefile b/wpa_supplicant/Makefile
-index 45d6ada..f131e92 100644
---- a/wpa_supplicant/Makefile
-+++ b/wpa_supplicant/Makefile
-@@ -226,12 +226,6 @@ LDFLAGS += -framework CoreFoundation
- LDFLAGS += -F/System/Library/PrivateFrameworks -framework Apple80211
- endif
- 
--ifdef CONFIG_DRIVER_PS3
--CFLAGS += -DCONFIG_DRIVER_PS3 -m64
--OBJS_d += ../src/drivers/driver_ps3.o
--LDFLAGS += -m64
--endif
--
- ifdef CONFIG_DRIVER_IPHONE
- CFLAGS += -DCONFIG_DRIVER_IPHONE
- OBJS_d += ../src/drivers/driver_iphone.o
--- 
-1.6.2.4
-