qi-hardware/openwrt-xburst
1
0
Fork 0
mirror of git://projects.qi-hardware.com/openwrt-xburst.git synced 2024-11-27 22:21:51 +02:00
Code

wpa_supplicant: fix regressions introduced by the ibss-rsn changes

Browse Source 
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@31087 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
nbd 2012-03-27 13:38:08 +00:00
parent 4e6d1ddc42
commit 6f5aac5856
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
package/hostapd/files/wpa_supplicant.sh
View File

@ -3,7 +3,7 @@ wpa_supplicant_setup_vif() {
local driver="$2" local driver="$2"
local key="$key" local key="$key"
local options="$3" local options="$3"
local freq local freq=""
[ -n "$4" ] && freq="frequency=$4" [ -n "$4" ] && freq="frequency=$4"
# wpa_supplicant should use wext for mac80211 cards # wpa_supplicant should use wext for mac80211 cards
@ -25,7 +25,7 @@ wpa_supplicant_setup_vif() {
config_set "$vif" bridge "$bridge" config_set "$vif" bridge "$bridge"
} }
local mode ifname wds local mode ifname wds modestr=""
config_get mode "$vif" mode config_get mode "$vif" mode
config_get ifname "$vif" ifname config_get ifname "$vif" ifname
config_get_bool wds "$vif" wds 0 config_get_bool wds "$vif" wds 0
@ -33,6 +33,7 @@ wpa_supplicant_setup_vif() {
echo "wpa_supplicant_setup_vif($ifname): Refusing to bridge $mode mode interface" echo "wpa_supplicant_setup_vif($ifname): Refusing to bridge $mode mode interface"
return 1 return 1
} }
[ "$mode" = "adhoc" ] && modestr="mode=1"
case "$enc" in case "$enc" in
*none*) *none*)
@ -126,7 +127,7 @@ wpa_supplicant_setup_vif() {
cat > /var/run/wpa_supplicant-$ifname.conf <<EOF cat > /var/run/wpa_supplicant-$ifname.conf <<EOF
ctrl_interface=/var/run/wpa_supplicant-$ifname ctrl_interface=/var/run/wpa_supplicant-$ifname
network={ network={
$mode $modestr
scan_ssid=1 scan_ssid=1
ssid="$ssid" ssid="$ssid"
$bssid $bssid