madwifi: allow disabling of hardware ibss merges by setting the wifi-iface option...

SVN-Revision: 12993

diff --git a/package/madwifi/files/lib/wifi/madwifi.sh b/package/madwifi/files/lib/wifi/madwifi.sh
index df345316b5205f8bdc107323a44adcab8eb83866..e4e99822bd0e840a09967a43e2051b1fdfdcf019 100755 (executable)
--- a/package/madwifi/files/lib/wifi/madwifi.sh
+++ b/package/madwifi/files/lib/wifi/madwifi.sh
@@ -85,7 +85,10 @@ enable_atheros() {
                config_get eap_type "$vif" eap_type
                config_get mode "$vif" mode
                
                config_get eap_type "$vif" eap_type
                config_get mode "$vif" mode
                

-               [ "$mode" = sta ] && config_get nosbeacon "$device" nosbeacon
+               case "$mode" in
+                       sta) config_get nosbeacon "$device" nosbeacon;;
+                       adhoc) config_get nosbeacon "$vif" sw_merge;;
+               esac

                
                config_get ifname "$vif" ifname
                ifname=$(wlanconfig "$ifname" create wlandev "$device" wlanmode "$mode" ${nosbeacon:+nosbeacon})
                
                config_get ifname "$vif" ifname
                ifname=$(wlanconfig "$ifname" create wlandev "$device" wlanmode "$mode" ${nosbeacon:+nosbeacon})