[OpenWrt-Devel] [PATCH] Add configuration of igmpproxy through uci
Signed-off-by: Viktar Palstsiuk viktar.palsts...@promwad.com
---
net/igmpproxy/Makefile |8 +++---
net/igmpproxy/files/igmpproxy.conf | 43 --
net/igmpproxy/files/igmpproxy.config | 11
net/igmpproxy/files/igmpproxy.init | 34 ++-
4 files changed, 48 insertions(+), 48 deletions(-)
delete mode 100644 net/igmpproxy/files/igmpproxy.conf
create mode 100644 net/igmpproxy/files/igmpproxy.config
mode change 100644 = 100755 net/igmpproxy/files/igmpproxy.init
diff --git a/net/igmpproxy/Makefile b/net/igmpproxy/Makefile
index 43e13bb..ae0ac67 100644
--- a/net/igmpproxy/Makefile
+++ b/net/igmpproxy/Makefile
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=igmpproxy
PKG_VERSION:=0.1
-PKG_RELEASE:=3
+PKG_RELEASE:=4
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=@SF/igmpproxy
@@ -31,7 +31,7 @@ define Package/igmpproxy/description
endef
define Package/igmpproxy/conffiles
-/etc/igmpproxy.conf
+/etc/config/igmpproxy
endef
TARGET_CFLAGS += -Dlog=igmpproxy_log
@@ -43,8 +43,8 @@ define Build/Compile
endef
define Package/igmpproxy/install
- $(INSTALL_DIR) $(1)/etc
- $(INSTALL_CONF) ./files/igmpproxy.conf $(1)/etc/
+ $(INSTALL_DIR) $(1)/etc/config
+ $(INSTALL_CONF) ./files/igmpproxy.config $(1)/etc/config/igmpproxy
$(INSTALL_DIR) $(1)/etc/init.d
$(INSTALL_BIN) ./files/igmpproxy.init $(1)/etc/init.d/igmpproxy
$(INSTALL_DIR) $(1)/usr/sbin
diff --git a/net/igmpproxy/files/igmpproxy.conf
b/net/igmpproxy/files/igmpproxy.conf
deleted file mode 100644
index e01b918..000
--- a/net/igmpproxy/files/igmpproxy.conf
+++ /dev/null
@@ -1,43 +0,0 @@
-
-#
-# Example configuration file for the IgmpProxy
-#
-#
-# The configuration file must define one upstream
-# interface, and one or more downstream interfaces.
-#
-# If multicast traffic originates outside the
-# upstream subnet, the altnet option can be
-# used in order to define legal multicast sources.
-# (Se example...)
-#
-# The quickleave should be used to avoid saturation
-# of the upstream link. The option should only
-# be used if it's absolutely nessecary to
-# accurately imitate just one Client.
-#
-
-
-##--
-## Enable Quickleave mode (Sends Leave instantly)
-##--
-quickleave
-
-
-##--
-## Configuration for eth0 (Upstream Interface)
-##--
-phyint br-wan upstream ratelimit 0 threshold 1
-altnet 192.168.1.0/24
-
-
-##--
-## Configuration for eth1 (Downstream Interface)
-##--
-phyint br-lan downstream ratelimit 0 threshold 1
-
-
-##--
-## Configuration for eth2 (Disabled Interface)
-##--
-phyint eth2 disabled
diff --git a/net/igmpproxy/files/igmpproxy.config
b/net/igmpproxy/files/igmpproxy.config
new file mode 100644
index 000..ca625ac
--- /dev/null
+++ b/net/igmpproxy/files/igmpproxy.config
@@ -0,0 +1,11 @@
+config igmpproxy
+ option quickleave 1
+
+config phyint
+ option network wan
+ option direction upstream
+ list altnet 192.168.1.0/24
+
+config phyint
+ option network lan
+ option direction downstream
diff --git a/net/igmpproxy/files/igmpproxy.init
b/net/igmpproxy/files/igmpproxy.init
old mode 100644
new mode 100755
index 80e1bad..5b8d3c4
--- a/net/igmpproxy/files/igmpproxy.init
+++ b/net/igmpproxy/files/igmpproxy.init
@@ -1,5 +1,5 @@
#!/bin/sh /etc/rc.common
-# Copyright (C) 2010-2011 OpenWrt.org
+# Copyright (C) 2010-2012 OpenWrt.org
START=99
STOP=10
@@ -22,7 +22,39 @@ SERVICE_WRITE_PID=1
OPTIONS=
+igmp_header() {
+ local quickleave
+ config_get_bool quickleave $1 quickleave 0
+
+ mkdir -p /var/etc
+ rm -f /var/etc/igmpproxy.conf
+ [ $quickleave -gt 0 ] echo quickleave /var/etc/igmpproxy.conf
+
+ [ -L /etc/igmpproxy.conf ] || ln -nsf /var/etc/igmpproxy.conf
/etc/igmpproxy.conf
+}
+
+igmp_add_phyint() {
+local network direction altnets
+
+config_get network $1 network
+config_get direction $1 direction
+config_get altnets $1 altnet
+
+device=$(uci_get_state network $network ifname $network)
+echo -e \nphyint $device $direction ratelimit 0 threshold 1
/var/etc/igmpproxy.conf
+
+if [ -n
[OpenWrt-Devel] [PATCH] Implementing Easybox 802 - ARV752DPW
Implements the ARV752DPW architecture in mach-arv.c
Signed-off-by: Christian Rustmeier rustme...@gmail.com
---
Index: mach-arv.c
===
--- mach-arv.c (revision 31158)
+++ mach-arv.c (working copy)
@@ -754,3 +754,37 @@
ARV752DPW22,
ARV752DPW22 - Arcor A803,
arv752dpw22_init);
+
+
+
+
+
+
+static void __init
+arv752dpw_init(void)
+{
+#define ARV752DPW22_EBU 0x2
+#define ARV752DPW22_USB 100
+#define ARV752DPW22_RELAY 101
+#define ARV752DPW22_MAC_ADDR 0x7f0016
+
+ arv_load_nor(0x80);
+ ltq_register_gpio_ebu(ARV752DPW22_EBU);
+ ltq_add_device_gpio_leds(-1, ARRAY_SIZE(arv752dpw22_gpio_leds),
arv752dpw22_gpio_leds);
+ ltq_register_gpio_keys_polled(-1, LTQ_KEYS_POLL_INTERVAL,
ARRAY_SIZE(arv752dpw22_gpio_keys), arv752dpw22_gpio_keys);
+ ltq_pci_data.irq[14] = (INT_NUM_IM3_IRL0 + 31);
+ ltq_pci_data.gpio |= PCI_EXIN1 | PCI_REQ2;
+ ltq_register_pci(ltq_pci_data);
+ xway_register_dwc(ARV752DPW22_USB);
+ ltq_register_rt2x00(RT2860.eeprom);
+ arv_register_ethernet(ARV752DPW22_MAC_ADDR);
+ gpio_request(ARV752DPW22_RELAY, relay);
+ gpio_set_value(ARV752DPW22_RELAY, 1);
+ gpio_export(ARV752DPW22_RELAY, 0);
+
+}
+
+MIPS_MACHINE(LANTIQ_MACH_ARV752DPW,
+ ARV752DPW,
+ ARV752DPW - Arcor A802,
+ arv752dpw_init);
mach-arv.c.patch
Description: Binary data
___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/mailman/listinfo/openwrt-devel
[OpenWrt-Devel] [PATCH] Updated patch to check multiple instances in subfolders in local repository
Hi,
I have modified the patch as John suggested. This patch will only copy a
single file from local repository. If more than one instance of the same file
exists in the subfolders then it will throw an error. I have used latest trunk
(revision 31050) to test this patch.
Thanks John for your feedback.
Signed-off-by: Tathagata Das tathag...@alumnux.com
---
diff -Naur a/scripts/download.pl b/scripts/download.pl
--- a/scripts/download.pl 2012-03-05 10:44:02.0 +0530
+++ b/scripts/download.pl 2012-04-02 17:31:28.0 +0530
@@ -74,7 +74,18 @@
if(! -d $target) {
system(mkdir -p $target/);
}
- system(cp -vf $cache/$filename $target/$filename.dl) == 0 or
return;
+ system(find $cache -follow -name $filename 2/dev/null 1
temp.dls);
+ my $lines = `cat temp.dls | wc -l`;
+ if ($lines != 1 ) {
+ system(echo Error : Number of instances of $filename
in $cache is $lines);
+ system(echo Only one instance allowed.);
+ system(rm -f temp.dls);
+ return;
+ }
+ else {
+ system(cat temp.dls | xargs -i cp -vf {}
$target/$filename.dl);
+ system(rm -f temp.dls);
+ }
system($md5cmd $target/$filename.dl
\$target/$filename.md5sum\ ) == 0 or return;
} else {
open WGET, wget -t5 --timeout=20 --no-check-certificate
$options -O- \$mirror/$filename\ | or die Cannot launch wget.\n;
___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/mailman/listinfo/openwrt-devel
Re: [OpenWrt-Devel] [PATCH] Update rrdtool to version 1.4.7
Hi Roberto, Le 03/21/12 11:59, Roberto Riggio a écrit : This patch update rrdtool to version 1.4.7. Two version of the package are provided: rrdtool, which supports the graph command and links with pango and cairo (from the xorg feed) rrdtool-lite, which does NOT support the graph command and thus do not requires pango and cairo The first version requires also a font to be installed on openwrt, the patched makefile requires a font to be placed in the data directory of the package, however I'm not sure how I should post the font (attachment?) Signed-off-by: Roberto Riggio roberto.rig...@create-net.org The configure scripts fails complaining it could not find neither glib 2.0 nor libxml-2.0. Can you please start from a fresh build and test again if that works for you? Thank you very much. -- Florian ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel
Re: [OpenWrt-Devel] [PATCH] collectd: upgrade to 4.10.6
Hi Hannu, Le 02/20/12 17:13, Hannu Nyman a écrit : I sent a last week the patch to upgrade the current collectd 4.10.2 to 4.10.5, but the 4.10.6 has now been released. And it seems to include a patch to prevent collectd from intermittently collecting data after periods of heavy loads. I have noticed that to happen with 4.10.2, so hopefully the change corrects that. I have updated the Makefile and refreshed the patches. Two previous patches (004-version-gen-shell.sh and 300-fix-modbus.patch) are now unnecessary, as their changes have been implemented upstream. signed-off by: hannu.ny...@iki.fi Your patch does not apply cleanly to packages/ can you please resubmit it? While at it, please also make sure the patch can be applied with patch -p1 from the packages/ directory. Currently your patch has utils/collectd stripped off the patch paths. Thank you. -- Florian ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel
Re: [OpenWrt-Devel] [PATCH] Updated patch to check multiple instances in subfolders in local repository
While the existing perl code isn't the best either, yours is extremely
inefficient, you should rework it using native functions.
+ system(find $cache -follow -name $filename 2/dev/null 1
temp.dls);
perldoc -f open
+ my $lines = `cat temp.dls | wc -l`;
perldoc -f length, perldoc perlvar
+ if ($lines != 1 ) {
($lines 1) ?
+ system(echo Error : Number of instances of $filename
in $cache is $lines);
+ system(echo Only one instance allowed.);
perldoc -f print, perldoc -f warn
+ system(rm -f temp.dls);
perldoc -f unlink
+ return;
+ }
+ else {
+ system(cat temp.dls | xargs -i cp -vf {}
$target/$filename.dl);
perldoc -f open, perldoc -f readline
Also google useless use of cat.
+ system(rm -f temp.dls);
perldoc -f unlink
+ }
system($md5cmd $target/$filename.dl
\$target/$filename.md5sum\ ) == 0 or return;
} else {
open WGET, wget -t5 --timeout=20 --no-check-certificate
$options -O- \$mirror/$filename\ | or die Cannot launch wget.\n;
~ Jow
___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/mailman/listinfo/openwrt-devel
Re: [OpenWrt-Devel] [PATCH] collectd: upgrade to 4.10.6
On 2.4.2012 18:21, Florian Fainelli wrote:
Hi Hannu,
Le 02/20/12 17:13, Hannu Nyman a écrit :
I sent a last week the patch to upgrade the current collectd 4.10.2 to
4.10.5, but the 4.10.6 has now been released. And it seems to include a
patch to prevent collectd from intermittently collecting data after
periods of heavy loads. I have noticed that to happen with 4.10.2, so
hopefully the change corrects that.
I have updated the Makefile and refreshed the patches. Two previous
patches (004-version-gen-shell.sh and 300-fix-modbus.patch) are now
unnecessary, as their changes have been implemented upstream.
signed-off by: hannu.ny...@iki.fi
Your patch does not apply cleanly to packages/ can you please resubmit it?
While at it, please also make sure the patch can be applied with patch -p1
from the packages/ directory. Currently your patch has utils/collectd
stripped off the patch paths.
Thank you.
--
Florian
Please find attached a new version of the patch, which applies cleanly.
I attach it this time both inline and as a text attachment.
(The patch leaves two empty unnecessary files: 004-version-gen-shell.sh and
300-fix-modbus.patch)
Hannu
perus@HNVB:/Openwrt/trunk/feeds/packages$ patch -p1 -i collectd4106v2.patch
patching file utils/collectd/patches/004-version-gen-shell.sh
patching file utils/collectd/patches/300-fix-modbus.patch
patching file utils/collectd/patches/100-rrdtool-add-rrasingle-option.patch
patching file utils/collectd/patches/900-add-iwinfo-plugin.patch
patching file utils/collectd/patches/200-fix-git-describe-error.patch
patching file utils/collectd/Makefile
perus@HNVB:/Openwrt/trunk/feeds/packages$
Index: packages/utils/collectd/patches/004-version-gen-shell.sh
===
--- packages/utils/collectd/patches/004-version-gen-shell.sh (revision 31158)
+++ packages/utils/collectd/patches/004-version-gen-shell.sh (working copy)
@@ -1,8 +0,0 @@
a/version-gen.sh
-+++ b/version-gen.sh
-@@ -1,4 +1,4 @@
--#!/bin/sh
-+#!/usr/bin/env bash
-
- DEFAULT_VERSION=4.10.2.git
-
Index: packages/utils/collectd/patches/300-fix-modbus.patch
===
--- packages/utils/collectd/patches/300-fix-modbus.patch (revision 31158)
+++ packages/utils/collectd/patches/300-fix-modbus.patch(working copy)
@@ -1,34 +0,0 @@
a/src/modbus.c
-+++ b/src/modbus.c
-@@ -281,10 +281,8 @@ static int mb_init_connection (mb_host_t
-
- modbus_set_debug (host-connection, 1);
-
--#if 0
- /* We'll do the error handling ourselves. */
- modbus_set_error_handling (host-connection, NOP_ON_ERROR);
--#endif
-
- if ((host-port 1) || (host-port 65535))
- host-port = MODBUS_TCP_DEFAULT_PORT;
-@@ -293,10 +291,8 @@ static int mb_init_connection (mb_host_t
- host-node, host-port);
-
- modbus_init_tcp (host-connection,
-- /* host = */ host-node);
--#if 0
-+ /* host = */ host-node,
- /* port = */ host-port);
--#endif
-
- status = modbus_connect (host-connection);
- if (status != 0)
-@@ -325,7 +321,7 @@ static int mb_init_connection (mb_host_t
- static int mb_read_data (mb_host_t *host, mb_slave_t *slave, /* {{{ */
- mb_data_t *data)
- {
-- int values[2];
-+ uint16_t values[2];
- int values_num;
- const data_set_t *ds;
- int status;
Index: packages/utils/collectd/patches/100-rrdtool-add-rrasingle-option.patch
===
--- packages/utils/collectd/patches/100-rrdtool-add-rrasingle-option.patch
(revision 31158)
+++ packages/utils/collectd/patches/100-rrdtool-add-rrasingle-option.patch
(working copy)
@@ -17,7 +17,7 @@
/* consolidation_functions = */ NULL,
/* consolidation_functions_num = */ 0
};
-@@ -1027,6 +1030,14 @@ static int rrd_config (const char *key,
+@@ -1027,6 +1030,14 @@ static int rrd_config (const char *key,
free (value_copy);
}
Index: packages/utils/collectd/patches/900-add-iwinfo-plugin.patch
===
--- packages/utils/collectd/patches/900-add-iwinfo-plugin.patch (revision 31158)
+++ packages/utils/collectd/patches/900-add-iwinfo-plugin.patch (working copy)
@@ -1,6 +1,6 @@
--- a/configure.in
+++ b/configure.in
-@@ -471,6 +471,9 @@ AC_CHECK_HEADERS(netinet/if_ether.h, [],
+@@ -490,6 +490,9 @@ AC_CHECK_HEADERS(netinet/if_ether.h, [],
have_termios_h=no
AC_CHECK_HEADERS(termios.h, [have_termios_h=yes])
@@ -10,7 +10,7 @@
#
# Checks for typedefs, structures, and compiler characteristics.
#
-@@ -3985,6 +3988,7 @@ plugin_interface=no
+@@ -4006,6 +4009,7 @@ plugin_interface=no
plugin_ipmi=no
plugin_ipvs=no
plugin_irq=no
@@ -18,7 +18,7 @@
plugin_libvirt=no
plugin_load=no
plugin_memory=no
-@@ -4292,6 +4296,7 @@ AC_PLUGIN([ipmi],[$plugin_ipmi],
+@@ -4313,6 +4317,7 @@ AC_PLUGIN([ipmi],[$plugin_ipmi],
AC_PLUGIN([iptables],[$with_libiptc], [IPTables rule
Re: [OpenWrt-Devel] [PATCH] upgrade libffi
Le 02/19/12 01:32, Luka Perkov a écrit : libffi upgrade to version 3.0.10. Signed-off-by: Luka Perkovopen...@lukaperkov.net Applied in r31159, thanks Luka! -- Florian ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel
Re: [OpenWrt-Devel] [PATCH] freeradius2 add sqllog package
Le 02/29/12 18:16, andreas kraxner a écrit : Hi The package is used for creating sqlstatements to log a defined radius action to a file. can you add the patch to the freeradius2 makefile? the statements can be send later on to a central database by a script. Andreas Kraxner Applied in r31160, thanks! -- Florian ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel
Re: [OpenWrt-Devel] [PATCH] Haveged entropy gathering daemon - Package
Le 02/21/12 21:38, Oliver a écrit : On Sunday 19 Feb 2012 14:04:30 Hannu Nyman wrote: Manually compiling and installing 'librt' enables haveged to start and work. Apparently the haveged package definition is missing a dependency on 'librt'. I've checked the haveged makefile now, it only relies on librt, so the attached patch should have no issues under any platform. Signed-off-by: Oliver Smitholi...@8.c.9.b.0.7.4.0.1.0.0.2.ip6.arpa Applied in r31161, thanks Oliver! -- Florian ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel
Re: [OpenWrt-Devel] [PATCH] new package unixodbc
Le 02/08/12 11:41, Jiri Slachta a écrit : Signed-off-by: Jiri Slachtaj...@slachta.eu Applied in r31164, thanks! -- Florian ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel
Re: [OpenWrt-Devel] [PATCH] Add package for tunslip6 from Contiki 2.5.
Le 02/13/12 12:43, Markus Becker a écrit : Hello, this adds a package for utility tool called tunslip6 from the Contiki OS for estabilishing a SLIP connection over USB to an attached Contiki device for 6LoWPAN connectivity. Would be nice, if it could be applied upstream. Thanks, Markus Signed-off-by: Markus Beckerm...@comnets.uni-bremen.de Applied in r31165, thanks! -- Florian ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel
Re: [OpenWrt-Devel] [PATCH] upgrade ccache
Le 02/19/12 12:03, Luka Perkov a écrit : ccache upgrade to version 3.1.7. Signed-off-by: Luka Perkovopen...@lukaperkov.net Applied in r31166, thanks Luka! -- Florian ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel
Re: [OpenWrt-Devel] [PATCH] upgrade bison
Le 02/19/12 12:07, Luka Perkov a écrit : bison upgrade to version 2.5. Signed-off-by: Luka Perkovopen...@lukaperkov.net Applied in r31167, thanks Luka! -- Florian ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel
Re: [OpenWrt-Devel] [PATCH] upgrade cmake
Le 02/19/12 12:05, Luka Perkov a écrit : cmake upgrade to version 2.8.7. Signed-off-by: Luka Perkovopen...@lukaperkov.net --- Applied in r31168, thanks Luka! -- Florian ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel
Re: [OpenWrt-Devel] [PATCH] upgrade automake
Le 02/19/12 12:16, Luka Perkov a écrit : automake upgrade to version 1.11.3. Signed-off-by: Luka Perkovopen...@lukaperkov.net Applied in r31173, thanks Luka! -- Florian ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel
Re: [OpenWrt-Devel] [PATCH] upgrade gmp
Le 02/19/12 12:09, Luka Perkov a écrit : gmp upgrade to version 5.0.4. Signed-off-by: Luka Perkovopen...@lukaperkov.net Applied in r31169, thanks Luka! -- Florian ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel
Re: [OpenWrt-Devel] [PATCH] upgrade mpc
Le 02/19/12 17:44, Luka Perkov a écrit : mpc upgrade to version 0.9. Signed-off-by: Luka Perkovopen...@lukaperkov.net Applied in r31174, thanks Luka! -- Florian ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel
Re: [OpenWrt-Devel] [PATCH] upgrade qemu
Le 02/19/12 17:55, Luka Perkov a écrit : qemu upgrade to version 0.14.1. This patch has not been tested on freebsd. File block/sheepdog.c has been changed and the patch does no longer apply. Anyone with freebsd who could test this? All my other patches regarding the tools upgrade were tested on linux x64 and produce a working image. Once submitted patches get applied I will upgrade the remaining tools... Signed-off-by: Luka Perkovopen...@lukaperkov.net Applied in r31175, thanks Luka! -- Florian ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel
Re: [OpenWrt-Devel] [PATCH] upgrade mm-macros
Le 02/19/12 17:46, Luka Perkov a écrit : mm-macros upgrade to version 0.9.5. Signed-off-by: Luka Perkovopen...@lukaperkov.net Applied in r31176; thanks Luka! -- Florian ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel
Re: [OpenWrt-Devel] [PATCH] update crda
Le 02/11/12 19:58, Luka Perkov a écrit : Update crda to the last upstream version 1.1.2 and refresh patches. Signed-off-by: Luka Perkovopen...@lukaperkov.net Applied in r31177, thanks Luka! -- Florian ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel
Re: [OpenWrt-Devel] [PATCH] update and move util-linux(-ng)
Le 02/09/12 00:12, Luka Perkov a écrit : This patch makes several changes with util-linux-ng package: * moves it to util-linux (upstream name) * bumps it to last stable version 2.20.1 (was 2.13.0.1) * adds new package getopt * sorts packages inside Makefile * removes patch, it has been applied upstream I would also like to maintain this package. Signed-off-by: Luka Perkovopen...@lukaperkov.net Applied in r31178, thanks Luka! -- Florian ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel
Re: [OpenWrt-Devel] [PATCH] upgrade cloog
Le 02/19/12 12:11, Luka Perkov a écrit : cloog upgrade to version 0.15.11. Signed-off-by: Luka Perkovopen...@lukaperkov.net Applied in r31170, thanks Luka! -- Florian ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel
Re: [OpenWrt-Devel] [PATCH] upgrade mkimage
Le 02/19/12 17:42, Luka Perkov a écrit : mkimage upgrade to version 2011.12. Signed-off-by: Luka Perkovopen...@lukaperkov.net Applied in r31171, thanks Luka! -- Florian ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel
Re: [OpenWrt-Devel] [PATCH] upgrade xz
Le 02/19/12 12:14, Luka Perkov a écrit : xz upgrade to version 5.0.3. Signed-off-by: Luka Perkovopen...@lukaperkov.net Applied in r31172, thanks Luka! -- Florian ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel
[OpenWrt-Devel] iproute 3.3? (was: iproute2 bump to 3.2.0 and ss now available)
iproute-3.3 was released march 19th. I've been using the git version for months now (on 3.2 and 3.3), but I'd done things like rip out esfq (totally obsolete), q_wrr (does it even work?), and was puzzled as to why it fiddled so much with pkt_sched.h... So I'll gladly produce an openwrt patch for iproute-3.3, but would like answers to the above questions first... In my case iproute-3.3 is needed for adaptive red, the enhanced sfq, and sfqred... I note the sfq enhancements in 3.3 expose a bug in qos-scripts where 'limit' is packets, but is passed as bytes. commit 18cb809850fb499ad9bf288696a95f4071f73931 Author: Eric Dumazet eric.duma...@gmail.com Date: Wed Jan 4 14:18:38 2012 + net_sched: sfq: extend limits SFQ as implemented in Linux is very limited, with at most 127 flows and limit of 127 packets. [ So if 127 flows are active, we have one packet per flow ] This patch brings to SFQ following features to cope with modern needs. - Ability to specify a smaller per flow limit of inflight packets. (default value being at 127 packets) - Ability to have up to 65408 active flows (instead of 127) - Ability to have head drops instead of tail drops (to drop old packets from a flow) Example of use : No more than 20 packets per flow, max 8000 flows, max 2 packets in SFQ qdisc, hash table of 65536 slots. tc qdisc add ... sfq \ flows 8000 \ depth 20 \ headdrop \ limit 2 \ divisor 65536 Ram usage : 2 bytes per hash table entry (instead of previous 1 byte/entry) 32 bytes per flow on 64bit arches, instead of 384 for QFQ, so much better cache hit ratio. the sfqred support in 3.3, described here: commit 6987ecf0832d62350ea10432f3f1f7a84c457b81 Author: Eric Dumazet eric.duma...@gmail.com Date: Fri Jan 20 12:17:43 2012 +0100 sfq: add optional RED on top of SFQ Adds an optional Random Early Detection on each SFQ flow queue. Traditional SFQ limits count of packets, while RED permits to also control number of bytes per flow, and adds ECN capability as well. 1) We dont handle the idle time management in this RED implementation, since each 'new flow' begins with a null qavg. We really want to address backlogged flows. 2) if headdrop is selected, we try to ecn mark first packet instead of currently enqueued packet. This gives faster feedback for tcp flows compared to traditional RED [ marking the last packet in queue ] Example of use : tc qdisc add dev $DEV parent 1:1 handle 10: est 1sec 4sec sfq \ limit 3000 headdrop flows 512 divisor 16384 \ redflowlimit 10 min 8000 max 6 probability 0.20 ecn qdisc sfq 10: parent 1:1 limit 3000p quantum 1514b depth 127 headdrop flows 512/16384 divisor 16384 ewma 6 min 8000b max 6b probability 0.2 ecn prob_mark 0 prob_mark_head 4876 prob_drop 6131 forced_mark 0 forced_mark_head 0 forced_drop 0 Sent 1175211782 bytes 777537 pkt (dropped 6131, overlimits 11007 requeues 0) rate 99483Kbit 8219pps backlog 689392b 456p requeues 0 In this test, with 64 netperf TCP_STREAM sessions, 50% using ECN enabled flows, we can see number of packets CE marked is smaller than number of drops (for non ECN flows) If same test is run, without RED, we can check backlog is much bigger. qdisc sfq 10: parent 1:1 limit 3000p quantum 1514b depth 127 headdrop flows 512/16384 divisor 16384 Sent 1148683617 bytes 795006 pkt (dropped 0, overlimits 0 requeues 0) rate 98429Kbit 8521pps backlog 1221290b 841p requeues 0 Signed-off-by: Eric Dumazet eric.duma...@gmail.com On Mon, Apr 2, 2012 at 10:02 AM, Florian Fainelli flor...@openwrt.orgwrote: Le 02/16/12 14:49, Oliver a écrit : This patch bumps iproute2 to the latest available version, fixes the package URL to use kernel.org (as things have now been moved back there) and also adds ss (socket statistics) to menuconfig. Signed-off-by: Oliver Smitholipro@8.c.9.b.0.7.4.0.**1.0.0.2.ip6.arpa Applied in r31179, thanks Oliver! -- Florian __**_ openwrt-devel mailing list openwrt-devel@lists.openwrt.**org openwrt-devel@lists.openwrt.org https://lists.openwrt.org/**mailman/listinfo/openwrt-develhttps://lists.openwrt.org/mailman/listinfo/openwrt-devel -- Dave Täht SKYPE: davetaht US Tel: 1-239-829-5608 http://www.bufferbloat.net ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel
Re: [OpenWrt-Devel] iproute 3.3? (was: iproute2 bump to 3.2.0 and ss now available)
On Mon, Apr 2, 2012 at 11:06 AM, Dave Taht dave.t...@gmail.com wrote: iproute-3.3 was released march 19th. I've been using the git version for months now (on 3.2 and 3.3), but I'd done things like rip out esfq (totally obsolete), q_wrr (does it even work?), and was puzzled as to why it fiddled so much with pkt_sched.h... This was my hacked and slashed update from iproute 3.2 to iproute-3.3. https://github.com/dtaht/Cerowrt-3.3/commit/859f5aa8b033ba66044548db25e5e041bba95ec2 Why is htb getting scribbled on? -- Dave Täht SKYPE: davetaht US Tel: 1-239-829-5608 http://www.bufferbloat.net ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel
Re: [OpenWrt-Devel] [PATCH] Initial support for Mikrotik RB751G-2HnD and RB751U-2HnD
Hi, can we get this applied please, before it goes stale?
Thanks
On 31 March 2012 23:22, Hanno Schupp hanno.sch...@gmail.com wrote:
Great collaboration on these two fantastic routers on the openwrt forum:
https://forum.openwrt.org/viewtopic.php?id=32320
Above all kudos to aryufan. Well done and thank you everyone else who
contributed.
To-Do: LED for wlan is not yet activated
Signed-off-by: Hanno Schupp hanno.sch...@gmail.com
Index: target/linux/ar71xx/files/arch/mips/ath79/mach-rb750.c
===
--- target/linux/ar71xx/files/arch/mips/ath79/mach-rb750.c (revision
31152)
+++ target/linux/ar71xx/files/arch/mips/ath79/mach-rb750.c (working copy)
@@ -9,17 +9,24 @@
*/
#include linux/export.h
+#include linux/pci.h
+#include linux/ath9k_platform.h
#include linux/platform_device.h
#include linux/phy.h
#include linux/ar8216_platform.h
#include asm/mach-ath79/ar71xx_regs.h
#include asm/mach-ath79/ath79.h
+#include asm/mach-ath79/pci.h
+#include asm/mach-ath79/irq.h
#include asm/mach-ath79/mach-rb750.h
#include common.h
+#include dev-usb.h
#include dev-eth.h
#include machtypes.h
+#include pci-ath9k-fixup.h
+#include pci.h
static struct rb750_led_data rb750_leds[] = {
{
@@ -270,3 +277,91 @@
MIPS_MACHINE(ATH79_MACH_RB_750G_R3, 750Gr3, MikroTik RouterBOARD 750GL,
rb750gr3_setup);
+
+static struct ath9k_platform_data rb751_wmac_data = {
+ .led_pin = -1,
+};
+
+static u8 rb751_wmac_mac[6];
+
+static int rb751_pci_plat_dev_init(struct pci_dev *dev)
+{
+ switch (PCI_SLOT(dev-devfn)) {
+ case 0:
+ dev-dev.platform_data = rb751_wmac_data;
+ break;
+ }
+
+ return 0;
+}
+
+static int decode_rle(char* output, int len, char* in)
+{
+ char* ptr = output;
+ char* end = output + len;
+ while(*in)
+ {
+ if(*in 0)
+ {
+ int i = -*in++;
+ while(i-- 0)
+ {
+ if(ptr = end)
+
return -1;
+ *ptr++ =
*in++;
+ }
+ }
+ else if(*in 0)
+ {
+ int i = *in++;
+ while(i-- 0)
+ {
+ if(ptr = end)
+
return -1;
+ *ptr++ = *in;
+ }
+ in++;
+ }
+ }
+ return ptr - output;
+}
+
+#define RB751_HARDCONFIG 0x1f00b000
+#define RB751_MAC_ADDRESS_OFFSET 0xE80
+#define RB751_CALDATA_OFFSET 0x27C
+
+static void __init rb751_wlan_and_usb_setup(void)
+{
+ u8 *hardconfig = (u8 *) KSEG1ADDR(RB751_HARDCONFIG);
+
+ ath79_register_usb();
+
+ ath79_pci_set_plat_dev_init(rb751_pci_plat_dev_init);
+ ath79_register_pci();
+
+ rb751_wmac_data.macaddr = memcpy(rb751_wmac_mac, hardconfig +
RB751_MAC_ADDRESS_OFFSET, 6);
+
+ if(decode_rle((char*)rb751_wmac_data.eeprom_data,
sizeof(rb751_wmac_data.eeprom_data), hardconfig + RB751_CALDATA_OFFSET) ==
sizeof(rb751_wmac_data.eeprom_data))
+ {
+ pr_info(rb7xx: calibration data found\n);
+ pci_enable_ath9k_fixup(0,
rb751_wmac_data.eeprom_data);
+ }
+}
+
+static void __init rb751_setup(void)
+{
+ rb750_setup();
+ rb751_wlan_and_usb_setup();
+}
+
+MIPS_MACHINE(ATH79_MACH_RB_751, 751, MikroTik RouterBOARD 751,
+ rb751_setup);
+
+static void __init rb751g_setup(void)
+{
+ rb750gr3_setup();
+ rb751_wlan_and_usb_setup();
+}
+
+MIPS_MACHINE(ATH79_MACH_RB_751G, 751g, MikroTik RouterBOARD 751G,
+ rb751g_setup);
Index: target/linux/ar71xx/patches-3.2/614-MIPS-ath79-RB751G-support.patch
===
---
target/linux/ar71xx/patches-3.2/614-MIPS-ath79-RB751G-support.patch
(revision 0)
+++ target/linux/ar71xx/patches-3.2/614-MIPS-ath79-RB751G-support.patch
(revision 0)
@@ -0,0 +1,11 @@
+---
