luci-0.10: Another part of the merge was missing

diff --git a/applications/luci-ffwizard/root/etc/uci-defaults/device-defaults b/applications/luci-ffwizard/root/etc/uci-defaults/device-defaults
index 011148d59291a78b2a8af75a8bf98a0d95db7257..6a70e67a2ee3ad016d1f1c0af5db7b27ae24d1da 100755 (executable)
--- a/applications/luci-ffwizard/root/etc/uci-defaults/device-defaults
+++ b/applications/luci-ffwizard/root/etc/uci-defaults/device-defaults
@@ -8,9 +8,7 @@ set_default_config()
                atheros)
                        uci -q batch <<-EOF
                                set freifunk.wifi_device.channel=1
-                               set freifunk.wifi_device.diversity=0
-                               set freifunk.wifi_device.txantenna=1
-                               set freifunk.wifi_device.rxantenna=1
+                               set freifunk.wifi_device.diversity=1
                                set freifunk.wifi_device.disabled=0
                                set freifunk.wifi_device.txpower=""
                                set freifunk.wifi_device.hwmode=11g
@@ -27,7 +25,7 @@ set_default_config()
                mac80211)
                        uci -q batch <<-EOF
                                set freifunk.wifi_device.channel=1
-                               set freifunk.wifi_device.diversity=""
+                               set freifunk.wifi_device.diversity=1
                                set freifunk.wifi_device.disabled=0
                                set freifunk.wifi_device.txpower=""
                                set freifunk.wifi_device.distance=1000
@@ -43,11 +41,9 @@ set_default_config()
                broadcom)
                        uci -q batch <<-EOF
                                set freifunk.wifi_device.channel=1
-                               set freifunk.wifi_device.diversity=""
+                               set freifunk.wifi_device.diversity=1
                                set freifunk.wifi_device.disabled=0
                                set freifunk.wifi_device.txpower=""
-                               set freifunk.wifi_device.txantenna=0
-                               set freifunk.wifi_device.rxantenna=0
                                set freifunk.wifi_device.hwmode=11g
                                set freifunk.wifi_device.distance=1000
                                set freifunk.wifi_iface=defaults