diff options
Diffstat (limited to 'contrib')
7 files changed, 23 insertions, 20 deletions
diff --git a/contrib/package/community-profiles/files/etc/config/profile_potsdam b/contrib/package/community-profiles/files/etc/config/profile_potsdam index c15624a9fd..9bdb603239 100644 --- a/contrib/package/community-profiles/files/etc/config/profile_potsdam +++ b/contrib/package/community-profiles/files/etc/config/profile_potsdam @@ -1,19 +1,35 @@ config 'community' 'profile' option 'name' 'Freifunk Potsdam' option 'homepage' 'http://potsdam.freifunk.net' - option 'ssid' 'www.freifunk-potsdam.de' + option 'ssid' 'Freifunk-Potsdam-XXX-YYY' option 'mesh_network' '10.22.0.0/16' option 'splash_network' '192.168.22.0/24' option 'splash_prefix' '24' option 'latitude' '52.39349' option 'longitude' '13.06489' + option 'ipv6' '0' + +config 'defaults' 'interface' + option 'netmask' '255.255.0.0' + option 'dns' '85.214.20.141 213.73.91.35 194.150.168.168' + option 'delegate' '0' config 'defaults' 'wifi_device' option 'channel' '5' +config 'defaults' 'wifi_device_5' + option 'channel' '44' + config 'defaults' 'bssidscheme' option '5' '02:CA:FF:EE:BA:BE' + option '44' '02:CA:FF:EE:BA:BE' -config 'defaults' 'interface' - option 'dns' '85.214.20.141 213.73.91.35 194.150.168.168' +config 'defaults' 'ssidscheme' + option '5' 'Mesh23' + option '44' 'Mesh23' + +config 'defaults' 'dhcp' + option 'leasetime' '15m' +config 'defaults' 'olsrd' + option 'LinkQualityAlgorithm' 'etx_ffeth' diff --git a/contrib/package/freifunk-common/Makefile b/contrib/package/freifunk-common/Makefile index d9bbd994a1..2b9336fb06 100644 --- a/contrib/package/freifunk-common/Makefile +++ b/contrib/package/freifunk-common/Makefile @@ -4,7 +4,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=freifunk-common -PKG_RELEASE:=2 +PKG_RELEASE:=3 PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME) diff --git a/contrib/package/freifunk-common/files/etc/config/freifunk b/contrib/package/freifunk-common/files/etc/config/freifunk index 9a46f056ad..b1a2e41e2a 100644 --- a/contrib/package/freifunk-common/files/etc/config/freifunk +++ b/contrib/package/freifunk-common/files/etc/config/freifunk @@ -104,12 +104,6 @@ config 'defaults' 'wifi_iface' option 'bssid' '12:CA:FF:EE:BA:BE' option 'mcast_rate' '6000' -config 'defaults' 'madwifi_wifi_iface' - option 'bgscan' '0' - option 'sw_merge' '1' - option 'probereq' '1' - option 'mcast_rate' '5500' - config 'defaults' 'interface' option 'netmask' '255.255.0.0' option 'dns' '8.8.8.8 212.204.49.83 141.1.1.1' diff --git a/contrib/package/meshwizard/Makefile b/contrib/package/meshwizard/Makefile index 9ac5a06286..62983465c1 100644 --- a/contrib/package/meshwizard/Makefile +++ b/contrib/package/meshwizard/Makefile @@ -4,7 +4,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=meshwizard -PKG_RELEASE:=0.3.2 +PKG_RELEASE:=0.3.3 PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME) diff --git a/contrib/package/meshwizard/files/usr/bin/meshwizard/helpers/rename-wifi.sh b/contrib/package/meshwizard/files/usr/bin/meshwizard/helpers/rename-wifi.sh index e9139ed510..f2d10cc9e2 100755 --- a/contrib/package/meshwizard/files/usr/bin/meshwizard/helpers/rename-wifi.sh +++ b/contrib/package/meshwizard/files/usr/bin/meshwizard/helpers/rename-wifi.sh @@ -1,6 +1,6 @@ #!/bin/sh # This script renames IB_wifi_ interface names into real interface names used on this system. -# E.g. wireless.IB_wifi0 would become wireless.wifi0 on madwifi and wireless.radio0 on mac80211 +# E.g. wireless.IB_wifi0 would become wireless.radio0 on mac80211 . $dir/functions.sh diff --git a/contrib/package/meshwizard/files/usr/bin/meshwizard/helpers/setup_wifi.sh b/contrib/package/meshwizard/files/usr/bin/meshwizard/helpers/setup_wifi.sh index 41feb86651..707b7b72cd 100755 --- a/contrib/package/meshwizard/files/usr/bin/meshwizard/helpers/setup_wifi.sh +++ b/contrib/package/meshwizard/files/usr/bin/meshwizard/helpers/setup_wifi.sh @@ -59,11 +59,6 @@ uci set wireless.$net\_iface=wifi-iface # create new wifi-iface for $net from defaults set_defaults "wifi_iface_" wireless.$net\_iface -# overwrite some settings for type atheros (madwifi) -if [ "$type" = "atheros" ]; then - set_defaults "madwifi_wifi_iface_" wireless.${net} -fi - # overwrite defaults bssid="$($dir/helpers/gen_bssid.sh $channel $community)" diff --git a/contrib/package/meshwizard/files/usr/bin/meshwizard/helpers/supports_vap.sh b/contrib/package/meshwizard/files/usr/bin/meshwizard/helpers/supports_vap.sh index 0585ab5fe1..7fdff3c566 100755 --- a/contrib/package/meshwizard/files/usr/bin/meshwizard/helpers/supports_vap.sh +++ b/contrib/package/meshwizard/files/usr/bin/meshwizard/helpers/supports_vap.sh @@ -8,9 +8,7 @@ if [ -z "$dev" -o -z "$type" ]; then exit 1 fi -if [ "$type" = "atheros" ]; then - exit 0 -elif [ "$type" = "mac80211" ]; then +if [ "$type" = "mac80211" ]; then # not hostapd[-mini], no VAP if [ ! -x /usr/sbin/hostapd ]; then echo "WARNING: hostapd[-mini] is required to be able to use VAP with mac80211." |