aboutsummaryrefslogtreecommitdiffstats
path: root/package/kernel
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2013-12-03 16:22:56 +0000
committerFelix Fietkau <nbd@openwrt.org>2013-12-03 16:22:56 +0000
commitd1b9d7eb2c5aec77927cc07702546374476aba78 (patch)
tree82ce67cf9f14999644a94fc8f04e965adb3cf752 /package/kernel
parent40de15d9efd1a1baa99d722a808cbbe31c10716a (diff)
downloadmaster-187ad058-d1b9d7eb2c5aec77927cc07702546374476aba78.tar.gz
master-187ad058-d1b9d7eb2c5aec77927cc07702546374476aba78.tar.bz2
master-187ad058-d1b9d7eb2c5aec77927cc07702546374476aba78.zip
mac80211: fix ad-hoc network setup with netifd (#14564)
Signed-off-by: Felix Fietkau <nbd@openwrt.org> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@38993 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package/kernel')
-rw-r--r--package/kernel/mac80211/files/lib/netifd/wireless/mac80211.sh5
1 files changed, 2 insertions, 3 deletions
diff --git a/package/kernel/mac80211/files/lib/netifd/wireless/mac80211.sh b/package/kernel/mac80211/files/lib/netifd/wireless/mac80211.sh
index eefe1fed5d..16bcdb9ef4 100644
--- a/package/kernel/mac80211/files/lib/netifd/wireless/mac80211.sh
+++ b/package/kernel/mac80211/files/lib/netifd/wireless/mac80211.sh
@@ -271,8 +271,7 @@ mac80211_setup_adhoc() {
mcval=
[ -n "$mcast_rate" ] && hostapd_add_rate mcval "$mcast_rate"
- iw dev "$ifname" ibss join "$ssid" $freq $htmode \
- ${fixed:+fixed-freq} $bssid \
+ iw dev "$ifname" ibss join "$ssid" $freq $htmode fixed-freq $bssid \
${beacon_int:+beacon-interval $beacon_int} \
${brstr:+basic-rates $brstr} \
${mcval:+mcast-rate $mcval} \
@@ -309,7 +308,7 @@ mac80211_setup_vif() {
;;
adhoc)
wireless_vif_parse_encryption
- if [ "$wpa" -gt 0 ]; then
+ if [ "$wpa" -gt 0 -o "$auto_channel" -gt 0 ]; then
mac80211_setup_supplicant || failed=1
else
mac80211_setup_adhoc