projects
/
openwrt
/
svn-archive
/
archive.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
wpa_supplicant: modify wpa_supplicant.sh in order to support IBSS-RSN/WPA-NONE
[openwrt/svn-archive/archive.git]
/
package
/
hostapd
/
files
/
wpa_supplicant.sh
diff --git
a/package/hostapd/files/wpa_supplicant.sh
b/package/hostapd/files/wpa_supplicant.sh
index 8b1de169414d8511d5d4fcdcdd25544d1889fbde..84f6eaa95e9da5130f033c4171459b214f5ce55c 100644
(file)
--- a/
package/hostapd/files/wpa_supplicant.sh
+++ b/
package/hostapd/files/wpa_supplicant.sh
@@
-3,6
+3,8
@@
wpa_supplicant_setup_vif() {
local driver="$2"
local key="$key"
local options="$3"
local driver="$2"
local key="$key"
local options="$3"
+ local freq
+ [ -n "$4" ] && freq="frequency=$4"
# wpa_supplicant should use wext for mac80211 cards
[ "$driver" = "mac80211" ] && driver='wext'
# wpa_supplicant should use wext for mac80211 cards
[ "$driver" = "mac80211" ] && driver='wext'
@@
-59,6
+61,7
@@
wpa_supplicant_setup_vif() {
;;
*psk*)
key_mgmt='WPA-PSK'
;;
*psk*)
key_mgmt='WPA-PSK'
+ [ "$mode" = "adhoc" -a "$driver" != "nl80211" ] && key_mgmt='WPA-NONE'
config_get_bool usepassphrase "$vif" usepassphrase 1
if [ "$usepassphrase" = "1" ]; then
passphrase="psk=\"${key}\""
config_get_bool usepassphrase "$vif" usepassphrase 1
if [ "$usepassphrase" = "1" ]; then
passphrase="psk=\"${key}\""
@@
-123,11
+126,13
@@
wpa_supplicant_setup_vif() {
cat > /var/run/wpa_supplicant-$ifname.conf <<EOF
ctrl_interface=/var/run/wpa_supplicant-$ifname
network={
cat > /var/run/wpa_supplicant-$ifname.conf <<EOF
ctrl_interface=/var/run/wpa_supplicant-$ifname
network={
+ $mode
scan_ssid=1
ssid="$ssid"
$bssid
key_mgmt=$key_mgmt
$proto
scan_ssid=1
ssid="$ssid"
$bssid
key_mgmt=$key_mgmt
$proto
+ $freq
$ieee80211w
$passphrase
$pairwise
$ieee80211w
$passphrase
$pairwise