Upgrade the wing package to the latest git version.
This new version brings several bugfixes, an implementation of the
minstrel rate
control algorithm (which is now the default), and a few changes in the
link quality
estimation which should make the protocol more responsive to topology
changes.
Also the git repository address changed due to some internal naming
conflicts.
Signed-off-by: Roberto Riggio<roberto.rig...@create-net.org>
--
diff -urN
src/kamikaze/feeds/packages/net/wing//files/etc/uci-defaults/wing
src/openwrt-pkgs/wing/files/etc/uci-defaults/wing
--- src/kamikaze/feeds/packages/net/wing//files/etc/uci-defaults/wing
2010-11-24 16:35:05.599897438 +0100
+++ src/openwrt-pkgs/wing/files/etc/uci-defaults/wing 2010-11-20
10:40:13.092655002 +0100
@@ -1,13 +1,13 @@
uci set network.mesh=interface
uci set network.mesh.proto=wing
uci set network.mesh.profile=bulk
-uci set network.mesh.rc=static
+uci set network.mesh.rc=minstrel
uci set network.mesh.ls=fcfs
uci set network.mesh.metric=wcett
uci set network.mesh.prefix=6
-uci set network.mesh.period=36000
-uci set network.mesh.tau=360000
-uci set network.mesh.debug=true
+uci set network.mesh.period=10000
+uci set network.mesh.tau=100000
+uci set network.mesh.debug=false
cfg=$(uci add firewall zone)
uci set firewall.$cfg.name="mesh"
diff -urN
src/kamikaze/feeds/packages/net/wing//files/lib/network/wing.sh
src/openwrt-pkgs/wing/files/lib/network/wing.sh
--- src/kamikaze/feeds/packages/net/wing//files/lib/network/wing.sh
2010-11-24 16:35:05.583897439 +0100
+++ src/openwrt-pkgs/wing/files/lib/network/wing.sh 2010-11-20
10:40:13.088655002 +0100
@@ -36,16 +36,16 @@
exit 1
fi
- local profile rc ls prefix debug
+ local profile rc ls metric prefix period tau debug
config_get profile $config profile "bulk"
- config_get rc $config rc "static"
+ config_get rc $config rc "minstrel"
config_get ls $config ls "fcfs"
config_get metric $config metric "wcett"
config_get prefix $config prefix "6"
config_get period $config period "10000"
config_get tau $config tau "100000"
- config_get_bool debug $config debug "False"
+ config_get_bool debug $config debug "false"
local hwaddr=$(echo $hwaddrs | sed 's/ .*//');
local ipaddr=$(printf "$prefix.%d.%d.%d" $(echo $hwaddr | awk -F:
'{printf "0x%s 0x%s 0x%s",$4,$5,$6}'))
@@ -131,8 +131,12 @@
config_get ifname $1 ifname
config_get device $1 device
config_get hwmode $device hwmode "11bg"
- freq=$(iwlist $ifname freq | grep "Current Frequency" | sed -n
"s/^.*Current Frequency:\([0-9.]*\) GHz (Channel \([0-9]*\))/\1/p" | awk
'{print $1*1000}')
- freq=${freq:-"0"}
+ config_get channel $device channel "0"
+ [ "$channel" = "0" -o "$channel" = "auto" ] && {
+ logger -t "$device" "Channel not specified. Ignoring."
+ return 0
+ }
+ freq=$(iwlist $ifname freq | sed -n "s/^.*Channel 0*$channel :
\([0-9.]*\).*/\1/p" | awk '{print $1*1000}')
hwaddr=$(/sbin/ifconfig $ifname 2>&1 | sed -n 's/^.*HWaddr
\([0-9A-Za-z\-]*\).*/\1/p' | sed -e 's/\-/:/g' | cut -c1-17)
freqs=${freqs:+"$freqs "}$freq
hwmodes=${hwmodes:+"$hwmodes "}$hwmode
diff -urN src/kamikaze/feeds/packages/net/wing//Makefile
src/openwrt-pkgs/wing/Makefile
--- src/kamikaze/feeds/packages/net/wing//Makefile 2010-11-24
16:35:05.603897438 +0100
+++ src/openwrt-pkgs/wing/Makefile 2010-11-24 16:59:19.739897437 +0100
@@ -8,12 +8,12 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=wing
-PKG_VERSION:=20101023
+PKG_VERSION:=20101124
PKG_RELEASE:=1
-PKG_REV:=daffb8d7642c4a343951d67159504ff4f4da49ed
+PKG_REV:=890c6dfc230c17e42b98b8736831f23f6a5d3083
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
-PKG_SOURCE_URL:=http://github.com/create-net/click-wing.git
+PKG_SOURCE_URL:=git://github.com/rriggio/click.git
PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
PKG_SOURCE_VERSION:=$(PKG_REV)
PKG_SOURCE_PROTO:=git
@@ -64,7 +64,7 @@
(cd $(PKG_BUILD_DIR)/userlevel; \
$(STAGING_DIR_HOST)/bin/click-mkmindriver -p $(PKG_NAME) -C
$(STAGING_DIR_HOST) \
-f $(PKG_BUILD_DIR)/conf/wing/sample.click \
- -A --all -E Discard -E Print -E Null \
+ -A --all -E Discard -E Print -E PrintWifi -E Null \
-E InfiniteSource -E RatedSource -E EtherEncap -E UDPIPEncap \
-E RadiotapDecap -E RadiotapEncap \
-E ProbeTXRate -E MadwifiRate -E AutoRateFallback -E Minstrel \
_______________________________________________
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/mailman/listinfo/openwrt-devel
