summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorblogic <blogic@3c298f89-4303-0410-b956-a3cf2f4a3e73>2012-07-24 23:07:15 +0000
committerblogic <blogic@3c298f89-4303-0410-b956-a3cf2f4a3e73>2012-07-24 23:07:15 +0000
commitae557097050d5d5e3f53afb5a577ab87b068557f (patch)
tree47e8b2468b20899f13d1f4a166dad5e4e7f655a5
parent1673b2b377c2a587737f8ec7e0eb9d15e511140f (diff)
wpa_supplicant: add more parameters
Signed-off-by: Antonio Quartulli <ordex@autistici.org> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@32829 3c298f89-4303-0410-b956-a3cf2f4a3e73
-rw-r--r--package/hostapd/files/wpa_supplicant.sh44
-rw-r--r--package/mac80211/files/lib/wifi/mac80211.sh3
2 files changed, 40 insertions, 7 deletions
diff --git a/package/hostapd/files/wpa_supplicant.sh b/package/hostapd/files/wpa_supplicant.sh
index ed6597c25..6f89c646a 100644
--- a/package/hostapd/files/wpa_supplicant.sh
+++ b/package/hostapd/files/wpa_supplicant.sh
@@ -4,6 +4,8 @@ wpa_supplicant_setup_vif() {
local key="$key"
local options="$3"
local freq=""
+ local ap_scan=""
+ local scan_ssid="1"
[ -n "$4" ] && freq="frequency=$4"
# make sure we have the encryption type and the psk
@@ -30,7 +32,11 @@ wpa_supplicant_setup_vif() {
echo "wpa_supplicant_setup_vif($ifname): Refusing to bridge $mode mode interface"
return 1
}
- [ "$mode" = "adhoc" ] && modestr="mode=1"
+ [ "$mode" = "adhoc" ] && {
+ modestr="mode=1"
+ scan_ssid="0"
+ ap_scan="ap_scan=2"
+ }
key_mgmt='NONE'
case "$enc" in
@@ -117,22 +123,48 @@ wpa_supplicant_setup_vif() {
;;
esac
+ local fixed_freq bssid1 beacon_interval brates mrate
config_get ifname "$vif" ifname
config_get bridge "$vif" bridge
- config_get ssid "$vif" ssid
- config_get bssid "$vif" bssid
- bssid=${bssid:+"bssid=$bssid"}
+ bssid1=${bssid:+"bssid=$bssid"}
+ beacon_interval=${beacon_int:+"beacon_interval=$beacon_int"}
+
+ local br brval brsub brstr
+ [ -n "$basic_rate_list" ] && {
+ for br in $basic_rate_list; do
+ brval="$(($br / 1000))"
+ brsub="$((($br / 100) % 10))"
+ [ "$brsub" -gt 0 ] && brval="$brval.$brsub"
+ [ -n "$brstr" ] && brstr="$brstr,"
+ brstr="$brstr$brval"
+ done
+ brates=${basic_rate_list:+"rates=$brstr"}
+ }
+
+ local mcval=""
+ [ -n "$mcast_rate" ] && {
+ mcval="$(($mcast_rate / 1000))"
+ mcsub="$(( ($mcast_rate / 100) % 10 ))"
+ [ "$mcsub" -gt 0 ] && mcval="$mcval.$mcsub"
+ mrate=${mcast_rate:+"mcast_rate=$mcval"}
+ }
+
rm -rf /var/run/wpa_supplicant-$ifname
cat > /var/run/wpa_supplicant-$ifname.conf <<EOF
ctrl_interface=/var/run/wpa_supplicant-$ifname
+$ap_scan
network={
$modestr
- scan_ssid=1
+ scan_ssid=$scan_ssid
ssid="$ssid"
- $bssid
+ $bssid1
key_mgmt=$key_mgmt
$proto
$freq
+ ${fixed:+"fixed_freq=1"}
+ $beacon_interval
+ $brates
+ $mrate
$ieee80211w
$passphrase
$pairwise
diff --git a/package/mac80211/files/lib/wifi/mac80211.sh b/package/mac80211/files/lib/wifi/mac80211.sh
index 6b907b6a2..97fd05074 100644
--- a/package/mac80211/files/lib/wifi/mac80211.sh
+++ b/package/mac80211/files/lib/wifi/mac80211.sh
@@ -453,8 +453,9 @@ enable_mac80211() {
echo "enable_mac80211($device): Failed to set up wpa_supplicant for interface $ifname" >&2
# make sure this wifi interface won't accidentally stay open without encryption
ifconfig "$ifname" down
- continue
}
+ # wpa_supplicant will bring the iface up
+ continue
fi
}