aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSteven Barth <steven@midlink.org>2013-05-06 10:20:43 +0000
committerSteven Barth <steven@midlink.org>2013-05-06 10:20:43 +0000
commit528c719a3ff0df2fdcc4b25e574bb82fc5f08550 (patch)
treebff2fde4a4a0edc802e7ccfb409917c00cd6d1dd
parent7f8b27f0e56e2f678d63414c7be2633c4e05b546 (diff)
downloadupstream-528c719a3ff0df2fdcc4b25e574bb82fc5f08550.tar.gz
upstream-528c719a3ff0df2fdcc4b25e574bb82fc5f08550.tar.bz2
upstream-528c719a3ff0df2fdcc4b25e574bb82fc5f08550.zip
odhcp6c: Make SLAAC-only work without reqprefix=no
Previously if the upstream router did not provide any DHCPv6-service the wan6 interface would not come up even if RAs were received. The new behavior allows the wan6 interface to comeup with RA-only configuration after a timeout of 10s. git-svn-id: svn://svn.openwrt.org/openwrt/trunk@36555 3c298f89-4303-0410-b956-a3cf2f4a3e73
-rw-r--r--package/network/ipv6/odhcp6c/Makefile4
-rwxr-xr-xpackage/network/ipv6/odhcp6c/files/dhcpv6.script6
2 files changed, 7 insertions, 3 deletions
diff --git a/package/network/ipv6/odhcp6c/Makefile b/package/network/ipv6/odhcp6c/Makefile
index 298af3d7b9..140f27a313 100644
--- a/package/network/ipv6/odhcp6c/Makefile
+++ b/package/network/ipv6/odhcp6c/Makefile
@@ -8,14 +8,14 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=odhcp6c
-PKG_VERSION:=2013-04-23
+PKG_VERSION:=2013-05-05
PKG_RELEASE=$(PKG_SOURCE_VERSION)
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
PKG_SOURCE_URL:=git://github.com/sbyx/odhcp6c.git
PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=2515dbce13746bb1633cfa4b8e22424946a7f007
+PKG_SOURCE_VERSION:=493b90de720d198a988460bee83340dafbbfa10d
PKG_MAINTAINER:=Steven Barth <steven@midlink.org>
include $(INCLUDE_DIR)/package.mk
diff --git a/package/network/ipv6/odhcp6c/files/dhcpv6.script b/package/network/ipv6/odhcp6c/files/dhcpv6.script
index 56f8c39ca4..c81ffee65d 100755
--- a/package/network/ipv6/odhcp6c/files/dhcpv6.script
+++ b/package/network/ipv6/odhcp6c/files/dhcpv6.script
@@ -78,7 +78,11 @@ teardown_interface() {
}
case "$2" in
- informed|bound|updated|rebound|ra-updated)
+ bound)
+ teardown_interface "$1"
+ setup_interface "$1"
+ ;;
+ informed|updated|rebound|ra-updated)
setup_interface "$1"
;;
started|stopped|unbound)