Re: [OpenWrt-Devel] e3200 support question

2012-09-04 Thread Rafał Miłecki
2012/9/4 Warren Turkal w...@penguintechs.org:
 So, I looked on the openwrt supported devices list, and I noticed that the
 Linksys E3200 is on there. The page for the device claims support since svn
 revision r33003. However, that commit only adds a commented line to one of
 the Makefiles. If I uncomment that line, should I expect to be able to build
 a working image for the Linksys E3200 router?

 If not, are there any areas that I could provide effort to help get the
 E3200 working.

Kernel will start, but you won't get basic features working.

BCM5357 has integrated WiFi not supported by b43 or brcmsmac yet.
BCM5357 has USB WiFi card BCM43236 V2 bot handled by brcmfmac.
BCM5357 has integrated gigabit ethernet not handled by any driver yet.

I'll work on WiFi support and GMAC support when I get NAND flash
working. Don't expect BCM43236 V2 anytime soon :(

-- 
Rafał
___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/mailman/listinfo/openwrt-devel


[OpenWrt-Devel] [PATCH/RFC] ramips/rt305x: add initial support for Rt5350 SoC

2012-09-04 Thread Daniel Golle
Somehow detecting the RAM size in common/setup.c doesn't work here, it always
detects 64M and then crashes on devices with less RAM.
Probably using MEMC_REG_SDRAM_CFG1 to know the RAM size is how it could be, for
now I use the mem=32M kernel parameter to get stuff working.

Signed-off-by: Daniel Golle dgo...@allnet.de

diff --git 
a/target/linux/ramips/files/arch/mips/include/asm/mach-ralink/rt305x.h 
b/target/linux/ramips/files/arch/mips/include/asm/mach-ralink/rt305x.h
index 0afbb2f..c59135c 100644
--- a/target/linux/ramips/files/arch/mips/include/asm/mach-ralink/rt305x.h
+++ b/target/linux/ramips/files/arch/mips/include/asm/mach-ralink/rt305x.h
@@ -22,6 +22,7 @@ enum rt305x_soc_type {
RT305X_SOC_RT3052,
RT305X_SOC_RT3350,
RT305X_SOC_RT3352,
+   RT305X_SOC_RT5350,
 };
 
 extern enum rt305x_soc_type rt305x_soc;
@@ -51,6 +52,11 @@ static inline int soc_is_rt3352(void)
return rt305x_soc == RT305X_SOC_RT3352;
 }
 
+static inline int soc_is_rt5350(void)
+{
+   return rt305x_soc == RT305X_SOC_RT5350;
+}
+
 #define RT305X_MEM_SIZE_MIN (2 * 1024 * 1024)
 #define RT305X_MEM_SIZE_MAX (64 * 1024 * 1024)
 
diff --git 
a/target/linux/ramips/files/arch/mips/include/asm/mach-ralink/rt305x_regs.h 
b/target/linux/ramips/files/arch/mips/include/asm/mach-ralink/rt305x_regs.h
index db037a5..930b333 100644
--- a/target/linux/ramips/files/arch/mips/include/asm/mach-ralink/rt305x_regs.h
+++ b/target/linux/ramips/files/arch/mips/include/asm/mach-ralink/rt305x_regs.h
@@ -76,6 +76,9 @@
 #define RT3352_CHIP_NAME0  0x5452
 #define RT3352_CHIP_NAME1  0x20203235
 
+#define RT5350_CHIP_NAME0  0x33355452
+#define RT5350_CHIP_NAME1  0x20203035
+
 #define CHIP_ID_ID_MASK0xff
 #define CHIP_ID_ID_SHIFT   8
 #define CHIP_ID_REV_MASK   0xff
@@ -95,6 +98,12 @@
 #define RT3352_SYSCFG0_CPUCLK_LOW  0x0
 #define RT3352_SYSCFG0_CPUCLK_HIGH 0x1
 
+#define RT5350_SYSCFG0_CPUCLK_SHIFT8
+#define RT5350_SYSCFG0_CPUCLK_MASK 0x3
+#define RT5350_SYSCFG0_CPUCLK_360  0x0
+#define RT5350_SYSCFG0_CPUCLK_320  0x2
+#define RT5350_SYSCFG0_CPUCLK_300  0x3
+
 #define RT3352_SYSCFG1_USB0_HOST_MODE  BIT(10)
 
 #define RT3352_CLKCFG1_UPHY0_CLK_ENBIT(18)
diff --git a/target/linux/ramips/files/arch/mips/ralink/rt305x/clock.c 
b/target/linux/ramips/files/arch/mips/ralink/rt305x/clock.c
index 9585476..79b5a79 100644
--- a/target/linux/ramips/files/arch/mips/ralink/rt305x/clock.c
+++ b/target/linux/ramips/files/arch/mips/ralink/rt305x/clock.c
@@ -62,10 +62,28 @@ void __init rt305x_clocks_init(void)
rt305x_sys_clk.rate = rt305x_cpu_clk.rate / 3;
rt305x_uart_clk.rate = 4000;
rt305x_wdt_clk.rate = rt305x_sys_clk.rate;
+   } else if (soc_is_rt5350()) {
+   t = (t  RT5350_SYSCFG0_CPUCLK_SHIFT) 
+RT5350_SYSCFG0_CPUCLK_MASK;
+   switch (t) {
+   case RT5350_SYSCFG0_CPUCLK_360:
+   rt305x_cpu_clk.rate = 36000;
+   rt305x_sys_clk.rate = rt305x_cpu_clk.rate / 3;
+   break;
+   case RT5350_SYSCFG0_CPUCLK_320:
+   rt305x_cpu_clk.rate = 32000;
+   rt305x_sys_clk.rate = rt305x_cpu_clk.rate / 4;
+   break;
+   case RT5350_SYSCFG0_CPUCLK_300:
+   rt305x_cpu_clk.rate = 3;
+   rt305x_sys_clk.rate = rt305x_cpu_clk.rate / 3;
+   break;
+   }
+   rt305x_uart_clk.rate = 4000;
+   rt305x_wdt_clk.rate = rt305x_sys_clk.rate;
} else {
BUG();
}
-
 }
 
 /*
diff --git a/target/linux/ramips/files/arch/mips/ralink/rt305x/devices.c 
b/target/linux/ramips/files/arch/mips/ralink/rt305x/devices.c
index 07e950a..a45564b 100644
--- a/target/linux/ramips/files/arch/mips/ralink/rt305x/devices.c
+++ b/target/linux/ramips/files/arch/mips/ralink/rt305x/devices.c
@@ -404,7 +404,7 @@ void __init rt305x_register_usb(void)
 {
if (soc_is_rt305x() || soc_is_rt3350()) {
platform_device_register(rt305x_dwc_otg_device);
-   } else if (soc_is_rt3352()) {
+   } else if (soc_is_rt3352() | soc_is_rt5350()) {
platform_device_register(rt3352_ehci_device);
platform_device_register(rt3352_ohci_device);
} else {
diff --git a/target/linux/ramips/files/arch/mips/ralink/rt305x/rt305x.c 
b/target/linux/ramips/files/arch/mips/ralink/rt305x/rt305x.c
index 179f9b7..856d869 100644
--- a/target/linux/ramips/files/arch/mips/ralink/rt305x/rt305x.c
+++ b/target/linux/ramips/files/arch/mips/ralink/rt305x/rt305x.c
@@ -54,6 +54,9 @@ void __init ramips_soc_prom_init(void)
} else if (n0 == RT3352_CHIP_NAME0  n1 == RT3352_CHIP_NAME1) {
rt305x_soc = RT305X_SOC_RT3352;
name = RT3352;
+   } else if (n0 == RT5350_CHIP_NAME0  n1 

[OpenWrt-Devel] [PATCH] Update wifidog

2012-09-04 Thread Etienne Champetier
Hi

This patch update wifidog to the latest svn version
It correct a bufferoverflow and some segfaults

Tested on openwrt x86 kvm

Signed-off-by: Etienne CHAMPETIER etienne.champet...@free.fr


Index: net/wifidog/Makefile
===
--- net/wifidog/Makefile	(révision 33312)
+++ net/wifidog/Makefile	(copie de travail)
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2006,2008 OpenWrt.org
+# Copyright (C) 2006,2012 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@@ -8,12 +8,16 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=wifidog
-PKG_VERSION:=20090925
+PKG_REV:=1464
+PKG_VERSION:=r$(PKG_REV)
 PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:= @SF/$(PKG_NAME)
-PKG_MD5SUM:=e3ecacba67a91b6ea3c1072ba6c5a0b4
+PKG_SOURCE_URL:=https://dev.wifidog.org/svn/trunk/wifidog
+PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
+PKG_SOURCE_VERSION:=$(PKG_REV)
+PKG_SOURCE_PROTO:=svn
+PKG_SOURCE_MIRROR:=0
 
 PKG_FIXUP:=autoreconf
 PKG_INSTALL:=1

___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/mailman/listinfo/openwrt-devel


[OpenWrt-Devel] fetchmail 3.6.22 update patch

2012-09-04 Thread Peter Wagner
This patch updates fetchmail to 3.6.22

Signed-off-by: Peter Wagner tripo...@gmx.atdiff --git a/mail/fetchmail/Makefile b/mail/fetchmail/Makefile
index 7702f4e..14dc745 100644
--- a/mail/fetchmail/Makefile
+++ b/mail/fetchmail/Makefile
@@ -8,12 +8,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=fetchmail
-PKG_VERSION:=6.3.20
+PKG_VERSION:=6.3.22
 PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
 PKG_SOURCE_URL:=http://download.berlios.de/fetchmail
-PKG_MD5SUM:=76406dbb37471f911cbb483830afe068
+PKG_MD5SUM:=2f7b8ee1bed3a70839a2fb41a69c7f6e
 
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(BUILD_VARIANT)/$(PKG_NAME)-$(PKG_VERSION)
 PKG_INSTALL:=1
___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/mailman/listinfo/openwrt-devel


Re: [OpenWrt-Devel] e3200 support question

2012-09-04 Thread Warren Turkal
On Tue, Sep 4, 2012 at 1:15 AM, Rafał Miłecki zaj...@gmail.com wrote:

 2012/9/4 Warren Turkal w...@penguintechs.org:
  So, I looked on the openwrt supported devices list, and I noticed that
 the
  Linksys E3200 is on there. The page for the device claims support since
 svn
  revision r33003. However, that commit only adds a commented line to one
 of
  the Makefiles. If I uncomment that line, should I expect to be able to
 build
  a working image for the Linksys E3200 router?
 
  If not, are there any areas that I could provide effort to help get the
  E3200 working.

 Kernel will start, but you won't get basic features working.


This is good. So I am unlikely to brick it permanently. :) I also assume
that I'll be able flash the stock firmware with tftp if I screw it up,
right?


 BCM5357 has integrated WiFi not supported by b43 or brcmsmac yet.


Is this the wifi that you are working on?

BCM5357 has USB WiFi card BCM43236 V2 bot handled by brcmfmac.


Sounds like this is a problem.


 BCM5357 has integrated gigabit ethernet not handled by any driver yet.


Is this device documented in public anywhere?


 I'll work on WiFi support and GMAC support when I get NAND flash
 working. Don't expect BCM43236 V2 anytime soon :(


Thanks for the info.

wt
___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/mailman/listinfo/openwrt-devel


[OpenWrt-Devel] Attitude Adjustment (12.09-beta)

2012-09-04 Thread John Crispin
The OpenWrt Team is happy to announce the beta release of Attitude Adjustment 
(12.09)

This release is sligthly overdue, but it is now ready for testing.

The binaries are available here:
http://downloads.openwrt.org/attitude_adjustment/12.09-beta/

These are the beta binaries. We will not be merging anything new into trunk 
until we think that the binaries have had enough test coverage and potential 
bugs have been fixed. Once that stage is reached, we will branch and generate 
the final release binaries. We expect this process to take between 2-4 weeks.

EOL Notice for brcm-2.4:
Kernel 2.4 support has been dropped from Attitude Adjustment. For most devices 
using brcm47xx images is fine, but older models with only 16 MiB RAM or slower 
CPUs (200 Mhz) will not run properly with it. So for those devices, sticking 
with backfire is recommended.


Whats new in AA ?

Target specific improvements:
 * [ar71xx]:support for more ar71xx devices

 * [ramips]:support for Ralink devices

 * [bcm47xx]:   better support and image for Broadcom BCM4705 SOCs
Support for serial flash in brcm47xx
Fix out of memory when using wifi on BCM5354

 * [lantiq]:Almost complete Lantiq SoC support
New Asterisk channel driver for Lantiq TAPI

 * [x86]:   sysupgrade support
General improvements:


 * Improved LuCI interface
 * Switch to the netifd infrastructure for better network configuration support
 * Fixed Imagebuilder, relocatable SDK
 * Full (?) eglibc support
 * Release support for bridge firewalling
 * Vastly improved ath9k driver stability and performance
 * Dependency fixes for packages
 * More iptables addons, improved netfilter performance
 * Experimental support for 5 and 10MHz channels in ath5k and ath9k
 * Support for 6RD configuration
 * Experimental crashlog feature to track kernel oopses
 * Reduced space requirements and improved squashfs/kernel compression
 * Various package improvements and updates


Known issues that will get fixed during the beta phase:
 * the new ramips switch driver seems to cause problems on some boards
 * somehow vr9 images are not properly generated
 * 11b/g atheros units might have gpio problems due to the new gpiolib driver


OpenWrt is a project based on a consensus decision model amongst the core team 
developers. With over 1000 binary packages, the Attitude Adjustment release is 
the biggest to date.

These 1000+ packages have the inherent problem that they need to be maintained. 
As the name of the release already suggests things are in a process of 
adjusting. The main change is that the developer group has arrived at the 
mutual agreement, that the packages feed is too much bloat for the project to 
carry around. This massive set of packages causes the developers not to have 
enough time for the core of OpenWrt. The result is: The package feed is not 
being maintained in a way that ensures the required quality.

OpenWrt receives up to 20 new packages and updates every day. It is simply not 
possible for the core developers to test this constant stream of additions 
(beyond a basic compile test). In response to this, it has been decided that 
only packages with a dedicated maintainer will be supported. These maintained 
packages will be moved into the main repo, which has a set of clear guidelines 
as to what is merged under which conditions. OpenWrt will no longer merge 
anything and everything that is sent on one of the many channels that can be 
used for contributing.

We hope that by this split of maintained and unmaintained packages will benefit 
everyone. If you want to help by dedicating some of your time into maintaining 
a package - and/or merging patches - then please contact a member of the core 
developer team.

The next big change is that we will no longer accept patches via trac. Please 
only file bug reports there. All patches contributed via trac will be closed 
without discussion. If you want to contribute use the openwrt-devel mailing 
list.

We already agreed on the roadmap for the upcoming AA+1 release which we expect 
to finish around christmas time.

The planned roadmap includes:
 * Kernel v3.6 - this has cool new stuff such as the removal of the routing 
cache ...
 * Improve core integration and push the netfid / ubus concept to extended 
parts of the system
 * Port as many targets to the DeviceTree framework as possible
 * Further work on IPv6, bufferbloat, ...
 * Lantiq VDSL support
 * Optional SSP+PIE+PaX support
 * Rearrange the packages, as described above
 * Other cool things we can come up with


Please start testing and help us make this release a good one :-)


The OpenWrt Release Team
___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/mailman/listinfo/openwrt-devel


[OpenWrt-Devel] [PATCH] new package: njit8021xclient

2012-09-04 Thread xiangfu
From: Xiangfu xian...@openmobilefree.net

---
  This program widely used in China mainland universities for connect to 
Internet.(more then 18 unvercities)
  more info please checkout:

http://wiki.ubuntu.org.cn/%E5%8D%97%E4%BA%AC%E5%B7%A5%E7%A8%8B%E5%AD%A6%E9%99%A2802.1X%E5%AE%A2%E6%88%B7%E7%AB%AF
https://github.com/liuqun/njit8021xclient/

  They(oepnwrt.org.cn) asked me help on sent this patch to upstream.

  Xiangfu

 net/njit8021xclient/Makefile|   44 +++
 net/njit8021xclient/files/njit.conf |   10 
 net/njit8021xclient/files/njit.init |   38 ++
 3 files changed, 92 insertions(+)
 create mode 100644 net/njit8021xclient/Makefile
 create mode 100644 net/njit8021xclient/files/njit.conf
 create mode 100755 net/njit8021xclient/files/njit.init

diff --git a/net/njit8021xclient/Makefile b/net/njit8021xclient/Makefile
new file mode 100644
index 000..a6cbeb5
--- /dev/null
+++ b/net/njit8021xclient/Makefile
@@ -0,0 +1,44 @@
+# 
+# Copyright (C) feixiangfeixi...@openwrt.org.cn
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+include $(TOPDIR)/rules.mk
+include $(INCLUDE_DIR)/kernel.mk
+
+PKG_NAME:=njit8021xclient
+PKG_RELEASE:=1
+PKG_VERSION:=1.2
+PKG_SOURCE_URL:=https://github.com/downloads/liuqun/njit8021xclient/
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
+PKG_MD5SUM:=e56f158d6a2b10c0b72edee5eba2da9c
+
+include $(INCLUDE_DIR)/package.mk
+
+define Package/njit8021xclient
+  SECTION:=net
+  CATEGORY:=Network
+  TITLE:=NJIT 802.1X client program
+  URL:=http://liuqun.github.com/njit8021xclient
+  DEPENDS:=+libpcap +libopenssl +libpthread 
+endef
+
+define Package/njit8021xclient/description
+ 802.1X client from Nanjing Institude of Technology,
+ compatable with H3C iNode 802.1X client.
+ Support H3C/iNode's private authentication protocol V2.40-V3.60
+endef
+
+CONFIGURE_ARGS += \
+   --program-prefix=njit- \
+   $(NULL)
+
+define Package/njit8021xclient/install
+   $(INSTALL_DIR) $(1)/etc/init.d/
+   $(INSTALL_BIN) files/njit.init $(1)/etc/init.d/njit
+   $(INSTALL_DIR) $(1)/etc/config/
+   $(INSTALL_CONF) files/njit.conf $(1)/etc/config/njit
+endef
+
+$(eval $(call BuildPackage,njit8021xclient))
diff --git a/net/njit8021xclient/files/njit.conf 
b/net/njit8021xclient/files/njit.conf
new file mode 100644
index 000..2d1c2ad
--- /dev/null
+++ b/net/njit8021xclient/files/njit.conf
@@ -0,0 +1,10 @@
+
+config njit
+   option enabled '0'
+
+config user
+   option enable '0'
+   option username '111'
+   option ifname 'eth0.2'
+   option password 'xxx'
+
diff --git a/net/njit8021xclient/files/njit.init 
b/net/njit8021xclient/files/njit.init
new file mode 100755
index 000..99eb094
--- /dev/null
+++ b/net/njit8021xclient/files/njit.init
@@ -0,0 +1,38 @@
+#!/bin/sh /etc/rc.common
+# Copyright (C) 2012 OpenWrt.org.cn 
+# Copyright (C) 2012 feixiangfeixi...@openwrt.org.cn
+
+START=82
+
+logfile=/tmp/njit
+
+njit_config() {
+
+local username password ifname enable
+
+   config_get enable  $1 'enable' 0
+   [ $enable == 0 ] return 0
+   config_get username $1 username
+   config_get password $1 password
+   config_get ifname $1 ifname
+
+ njit-client $username $password $ifname
+
+}
+
+start()
+{
+
+enabled=$(uci get njit.@njit[0].enabled)
+[ $enabled == 1 ]{
+
+   config_load njit
+   config_foreach njit_config user
+
+}
+}
+stop()
+{
+kill njit-client
+echo stop
+}
-- 
1.7.9.5

___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/mailman/listinfo/openwrt-devel


[OpenWrt-Devel] [PATCH] update iftop to 1.0pre2

2012-09-04 Thread Russell Senior

Update iftop from 0.17 to 1.0pre2

This is tested on alix2, includes ipv6 support, please test on other
targets, I unceremoniously deleted the older patches without checking
to see that they were integrated upstream.

Signed-of-by: Russell Senior russ...@personaltelco.net

diff --git a/net/iftop/Makefile b/net/iftop/Makefile
index 9bd0461..40e0aba 100644
--- a/net/iftop/Makefile
+++ b/net/iftop/Makefile
@@ -8,19 +8,19 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=iftop
-PKG_VERSION:=0.17
-PKG_RELEASE:=2
+PKG_VERSION:=1.0pre2
+PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=http://www.ex-parrot.com/~pdw/iftop/download
-PKG_MD5SUM:=062bc8fb3856580319857326e0b8752d
+PKG_MD5SUM:=fef521a49ec0122458d02c64212af3c5
 
 include $(INCLUDE_DIR)/package.mk
 
 define Package/iftop
   SECTION:=net
   CATEGORY:=Network
-  DEPENDS:=+libpcap +libncurses +libpthread
+  DEPENDS:=+libpcap +libncursesw +libpthread
   TITLE:=display bandwith usage on an interface
   URL:=http://www.ex-parrot.com/~pdw/iftop/
 endef
diff --git a/net/iftop/patches/001-debian_armeb.patch 
b/net/iftop/patches/001-debian_armeb.patch
deleted file mode 100644
index 8abd92e..000
--- a/net/iftop/patches/001-debian_armeb.patch
+++ /dev/null
@@ -1,11 +0,0 @@
 a/ether.h
-+++ b/ether.h
-@@ -12,7 +12,7 @@ struct   ether_header {
-   u_int8_tether_dhost[ETHER_ADDR_LEN];
-   u_int8_tether_shost[ETHER_ADDR_LEN];
-   u_int16_t   ether_type;
--};
-+} __attribute__((packed));
- 
- struct vlan_8021q_header {
-   u_int16_t   priority_cfi_vid;
diff --git a/net/iftop/patches/002-debian_frozen_order.patch 
b/net/iftop/patches/002-debian_frozen_order.patch
deleted file mode 100644
index c622036..000
--- a/net/iftop/patches/002-debian_frozen_order.patch
+++ /dev/null
@@ -1,10 +0,0 @@
 a/ui.c
-+++ b/ui.c
-@@ -446,6 +446,7 @@ void screen_hash_clear() {
- hash_node_type* n = NULL;
- while(hash_next_item(screen_hash, n) == HASH_STATUS_OK) {
- host_pair_line* hpl = (host_pair_line*)n-rec;
-+hpl-total_recv = hpl-total_sent = 0;
- memset(hpl-recv, 0, sizeof(hpl-recv));
- memset(hpl-sent, 0, sizeof(hpl-sent));
- }
diff --git a/net/iftop/patches/003-debian_arm.patch 
b/net/iftop/patches/003-debian_arm.patch
deleted file mode 100644
index 090ea1c..000
--- a/net/iftop/patches/003-debian_arm.patch
+++ /dev/null
@@ -1,15 +0,0 @@
 a/cfgfile.c
-+++ b/cfgfile.c
-@@ -45,9 +45,9 @@ stringmap config;
- extern options_t options ;
- 
- int is_cfgdirective_valid(const char *s) {
--char **t;
--for (t = config_directives; *t != NULL; ++t)
--if (strcmp(s, *t) == 0) return 1;
-+int t;
-+for (t = 0; config_directives[t] != NULL; t++)
-+   if (strcmp(s, config_directives[t]) == 0) return 1;
- return 0;
- }
- 
diff --git a/net/iftop/patches/004-debian_bar_display.patch 
b/net/iftop/patches/004-debian_bar_display.patch
deleted file mode 100644
index 7efaa2b..000
--- a/net/iftop/patches/004-debian_bar_display.patch
+++ /dev/null
@@ -1,11 +0,0 @@
 a/options.c
-+++ b/options.c
-@@ -302,7 +302,7 @@ void options_read_args(int argc, char **
- break;
- 
- case 'b':
--config_set_string(show-bars, true);
-+config_set_string(show-bars, false);
- break;
- 
- case 'B':
diff --git a/net/iftop/patches/005-debian_bar_bytes.patch 
b/net/iftop/patches/005-debian_bar_bytes.patch
deleted file mode 100644
index b9ecc26..000
--- a/net/iftop/patches/005-debian_bar_bytes.patch
+++ /dev/null
@@ -1,11 +0,0 @@
 a/ui.c
-+++ b/ui.c
-@@ -263,7 +263,7 @@ static void draw_bar_scale(int* y) {
- char s[40], *p;
- int x;
- /* This 1024 vs 1000 stuff is just plain evil */
--readable_size(i, s, sizeof s, options.log_scale ? 1000 : 1024, 0);
-+readable_size(i, s, sizeof s, options.log_scale ? 1000 : 1024, 
options.bandwidth_in_bytes);
- p = s + strspn(s,  );
- x = get_bar_length(i * 8);
- mvaddch(*y + 1, x, ACS_BTEE);


-- 
Russell Senior, President
russ...@personaltelco.net
___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/mailman/listinfo/openwrt-devel