aboutsummaryrefslogtreecommitdiffstats
path: root/package/kernel/mac80211/files
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
commitee2cd0354cebbce7dea48fe5538eec2653fb9e90 (patch)
tree0d12163cb94704eb9c4d96d32a739a1d552a5ccb /package/kernel/mac80211/files
parent4155016637214ba210e2c78d29101bea32edecef (diff)
downloadupstream-ee2cd0354cebbce7dea48fe5538eec2653fb9e90.tar.gz
upstream-ee2cd0354cebbce7dea48fe5538eec2653fb9e90.tar.bz2
upstream-ee2cd0354cebbce7dea48fe5538eec2653fb9e90.zip
mac80211: fix ad-hoc network setup with netifd (#14564)
Signed-off-by: Felix Fietkau <nbd@openwrt.org> SVN-Revision: 38993
Diffstat (limited to 'package/kernel/mac80211/files')
-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