From: Steven Barth <cyrus@openwrt.org>
Date: Sat, 16 May 2015 10:12:15 +0000 (+0000)
Subject: map: set ealen to psidlen for lw4over6
X-Git-Tag: reboot~3056
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=1ffe824e81442089f0c70c40a3968313aa9b537f;p=openwrt%2Fstaging%2Fblogic.git

map: set ealen to psidlen for lw4over6

Signed-off-by: Steven Barth <steven@midlink.org>

SVN-Revision: 45689
---

diff --git a/package/network/ipv6/map/Makefile b/package/network/ipv6/map/Makefile
index 2a029f8fe8cb..09ba523ec08e 100644
--- a/package/network/ipv6/map/Makefile
+++ b/package/network/ipv6/map/Makefile
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=map
 PKG_VERSION:=3
-PKG_RELEASE:=3
+PKG_RELEASE:=4
 PKG_LICENSE:=GPL-2.0
 
 include $(INCLUDE_DIR)/package.mk
diff --git a/package/network/ipv6/map/src/mapcalc.c b/package/network/ipv6/map/src/mapcalc.c
index b4b3d736f006..b61e157fc39d 100644
--- a/package/network/ipv6/map/src/mapcalc.c
+++ b/package/network/ipv6/map/src/mapcalc.c
@@ -226,6 +226,9 @@ int main(int argc, char *argv[])
 		if (offset < 0)
 			offset = (lw4o6) ? 0 : (legacy) ? 4 : 6;
 
+		if (lw4o6 && ealen < 0 && psidlen >= 0)
+			ealen = psidlen;
+
 		// Find PD
 		struct blob_attr *c, *cur;
 		unsigned rem;