Merge branch 'master' of /home/cero1/src/openwrt

dtaht · Jun 29, 2012 · 92d8b81 · 92d8b81
2 parents 15ea9bf + 4af9b7e
commit 92d8b81
Show file tree

Hide file tree

Showing 6 changed files with 29 additions and 6 deletions.
diff --git a/package/base-files/files/lib/functions/network.sh b/package/base-files/files/lib/functions/network.sh
@@ -49,6 +49,7 @@ __network_gateway()
 
 	local __tmp="$(ubus call network.interface."$__iface" status 2>/dev/null)"
 	local __idx=1
+	local __enabled
 
 	json_load "${__tmp:-{}}"
 
@@ -60,9 +61,10 @@ __network_gateway()
 
 			json_select "$((__idx++))"
 			json_get_var __tmp target
+			json_get_var __enabled enabled
 
-			case "${__family}/${__tmp}" in
-				4/0.0.0.0|6/::)
+			case "${__enabled}/${__family}/${__tmp}" in
+				1/4/0.0.0.0|1/6/::)
 					json_get_var "$__var" nexthop
 					return $?
 				;;

diff --git a/package/netifd/Makefile b/package/netifd/Makefile
@@ -1,13 +1,13 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=netifd
-PKG_VERSION:=2012-06-27
+PKG_VERSION:=2012-06-29
 PKG_RELEASE=$(PKG_SOURCE_VERSION)
 
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=git://nbd.name/luci2/netifd.git
 PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
-PKG_SOURCE_VERSION:=13f7f295f33c2639c390d4a6b2c58d1845e12fc3
+PKG_SOURCE_VERSION:=4b284038e226b4deace501eae66c67737c7f324c
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 # PKG_MIRROR_MD5SUM:=
 # CMAKE_INSTALL:=1

diff --git a/target/linux/brcm63xx/patches-3.3/105-hw_random-add-Broadcom-BCM63xx-RNG-driver.patch b/target/linux/brcm63xx/patches-3.3/105-hw_random-add-Broadcom-BCM63xx-RNG-driver.patch
@@ -110,7 +110,7 @@ Signed-off-by: Florian Fainelli <florian@openwrt.org>
 +	return 4;
 +}
 +
-+static int __init bcm63xx_trng_probe(struct platform_device *pdev)
++static int __devinit bcm63xx_trng_probe(struct platform_device *pdev)
 +{
 +	struct resource *r;
 +	struct clk *clk;

diff --git a/target/linux/brcm63xx/patches-3.3/106-bcm63xx_watchdog_section_mismatch.patch b/target/linux/brcm63xx/patches-3.3/106-bcm63xx_watchdog_section_mismatch.patch
@@ -0,0 +1,20 @@
+--- a/drivers/watchdog/bcm63xx_wdt.c
++++ b/drivers/watchdog/bcm63xx_wdt.c
+@@ -301,7 +301,7 @@ static void bcm63xx_wdt_shutdown(struct
+ 	bcm63xx_wdt_pause();
+ }
+
+-static struct platform_driver bcm63xx_wdt = {
++static struct platform_driver bcm63xx_wdt_driver = {
+ 	.probe	= bcm63xx_wdt_probe,
+ 	.remove = __devexit_p(bcm63xx_wdt_remove),
+ 	.shutdown = bcm63xx_wdt_shutdown,
+@@ -311,7 +311,7 @@ static struct platform_driver bcm63xx_wd
+ 	}
+ };
+
+-module_platform_driver(bcm63xx_wdt);
++module_platform_driver(bcm63xx_wdt_driver);
+
+ MODULE_AUTHOR("Miguel Gaio <miguel.gaio@efixo.com>");
+ MODULE_AUTHOR("Florian Fainelli <florian@openwrt.org>");
diff --git a/target/linux/brcm63xx/patches-3.3/800-wl_exports.patch b/target/linux/brcm63xx/patches-3.3/800-wl_exports.patch
@@ -24,7 +24,7 @@
  	if (nvram.version <= 4)
 --- a/arch/mips/mm/cache.c
 +++ b/arch/mips/mm/cache.c
-@@ -57,6 +57,7 @@ void (*_dma_cache_wback)(unsigned long s
+@@ -58,6 +58,7 @@ void (*_dma_cache_wback)(unsigned long s
  void (*_dma_cache_inv)(unsigned long start, unsigned long size);
 
  EXPORT_SYMBOL(_dma_cache_wback_inv);

diff --git a/tools/Makefile b/tools/Makefile
@@ -61,6 +61,7 @@ $(curdir)/xfce-macros/compile := $(curdir)/automake/install
 $(curdir)/missing-macros/compile := $(curdir)/automake/install
 $(curdir)/e2fsprogs/compile := $(curdir)/automake/install
 $(curdir)/libelf/compile := $(curdir)/automake/install
+$(curdir)/sdcc/compile := $(curdir)/bison/install
 
 ifneq ($(CONFIG_CCACHE),)
 $(foreach tool, $(tools-y), $(eval $(curdir)/$(tool)/compile += $(curdir)/ccache/install))