From: Felix Fietkau <nbd@openwrt.org>
Date: Tue, 3 Dec 2013 16:22:56 +0000 (+0000)
Subject: mac80211: fix ad-hoc network setup with netifd (#14564)
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=ee2cd0354cebbce7dea48fe5538eec2653fb9e90;p=openwrt%2Fstaging%2Fnbd.git

mac80211: fix ad-hoc network setup with netifd (#14564)

Signed-off-by: Felix Fietkau <nbd@openwrt.org>

SVN-Revision: 38993
---

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