X-Git-Url: http://git.ozo.com/?a=blobdiff_plain;f=package%2Fwpa_supplicant%2Ffiles%2Fwpa_supplicant.sh;h=5053d1e2853bd47285bb5cf9f56b8121711462a2;hb=6dcf3c5eff7429c7f6f262863e49739470f841c8;hp=37ebef7a4b4a44f53f817f25cf1f9d37899a6875;hpb=54a7242228f97227299fa92bcde3a5b4a0327d20;p=openwrt-10.03%2F.git

diff --git a/package/wpa_supplicant/files/wpa_supplicant.sh b/package/wpa_supplicant/files/wpa_supplicant.sh
index 37ebef7a4..5053d1e28 100644
--- a/package/wpa_supplicant/files/wpa_supplicant.sh
+++ b/package/wpa_supplicant/files/wpa_supplicant.sh
@@ -28,11 +28,11 @@ wpa_supplicant_setup_vif() {
 				;;
 			esac
 		;;
-		WPA|wpa|WPA2|wpa2i|8021x|8021X)
+		WPA|wpa|WPA2|wpa2|8021x|8021X)
 			proto='WPA2'
 			key_mgmt='WPA-EAP'
 			config_get ca_cert "$vif" ca_cert
-			ca_cert="ca_cert=\"$ca_cert\""
+			ca_cert=${ca_cert:+"ca_cert=\"$ca_cert\""}
 			case "$eap_type" in
 				tls|TLS)
 					pairwise='pairwise=CCMP'
@@ -51,16 +51,20 @@ wpa_supplicant_setup_vif() {
 					password="password=\"$password\""
 				;;
 			esac
-			eap_type="eap_type=$(echo $eap_type | tr 'a-z' 'A-Z')"
+			eap_type="eap=$(echo $eap_type | tr 'a-z' 'A-Z')"
 		;;
 	esac
 	config_get ifname "$vif" ifname
 	config_get bridge "$vif" bridge
 	config_get ssid "$vif" ssid
+	config_get bssid "$vif" bssid
+	bssid=${bssid:+"bssid=$bssid"}
 	cat > /var/run/wpa_supplicant-$ifname.conf <<EOF
+ctrl_interface=/var/run/wpa_supplicant-$ifname
 network={
 	scan_ssid=1
 	ssid="$ssid"
+	$bssid
 	key_mgmt=$key_mgmt
 	proto=$proto
 	$passphrase
@@ -75,5 +79,5 @@ network={
 	$password
 }
 EOF
-	[ -z "$proto" ] || wpa_supplicant ${bridge:+ -b $bridge} -B -D ${driver:-wext} -i "$ifname" -c /var/run/wpa_supplicant-$ifname.conf
+	[ -z "$proto" ] || wpa_supplicant ${bridge:+ -b $bridge} -B -P "/var/run/wifi-${ifname}.pid" -D ${driver:-wext} -i "$ifname" -c /var/run/wpa_supplicant-$ifname.conf
 }