mirror of
git://projects.qi-hardware.com/openwrt-xburst.git
synced 2024-09-06 06:10:14 +03:00
mac80211: fix encryption fallback for sta mode, add frequency/bssid selection support
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@18025 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
parent
dd47052c85
commit
11e5f1bf7c
@ -231,14 +231,12 @@ enable_mac80211() {
|
|||||||
iw dev "$ifname" ibss join "$ssid" $freq ${fixed:+fixed-freq} $bssid
|
iw dev "$ifname" ibss join "$ssid" $freq ${fixed:+fixed-freq} $bssid
|
||||||
;;
|
;;
|
||||||
sta|mesh)
|
sta|mesh)
|
||||||
|
config_get bssid "$vif" bssid
|
||||||
case "$enc" in
|
case "$enc" in
|
||||||
*)
|
|
||||||
iw dev "$ifname" connect "$ssid"
|
|
||||||
;;
|
|
||||||
wep)
|
wep)
|
||||||
if [ -e "$keymgmt" ]; then
|
if [ -e "$keymgmt" ]; then
|
||||||
[ -n "$keystring" ] &&
|
[ -n "$keystring" ] &&
|
||||||
iw dev "$ifname" connect "$ssid" key "$keystring"
|
iw dev "$ifname" connect "$ssid" ${fixed:+$freq} $bssid key "$keystring"
|
||||||
else
|
else
|
||||||
if eval "type wpa_supplicant_setup_vif" 2>/dev/null >/dev/null; then
|
if eval "type wpa_supplicant_setup_vif" 2>/dev/null >/dev/null; then
|
||||||
wpa_supplicant_setup_vif "$vif" wext || {
|
wpa_supplicant_setup_vif "$vif" wext || {
|
||||||
@ -260,6 +258,9 @@ enable_mac80211() {
|
|||||||
}
|
}
|
||||||
fi
|
fi
|
||||||
;;
|
;;
|
||||||
|
*)
|
||||||
|
iw dev "$ifname" connect "$ssid" ${fixed:+$freq} $bssid
|
||||||
|
;;
|
||||||
esac
|
esac
|
||||||
|
|
||||||
;;
|
;;
|
||||||
|
Loading…
Reference in New Issue
Block a user