diff options
| author | Jonas Gorski <jogo@openwrt.org> | 2013-02-21 11:45:10 +0000 |
|---|---|---|
| committer | Jonas Gorski <jogo@openwrt.org> | 2013-02-21 11:45:10 +0000 |
| commit | 5636037cff0f19ceb15c88999bbd1a77ada0d6fe (patch) | |
| tree | d64d03946f18be6a7657bb93e91d216ffabc9a2f /package/busybox/patches/244-udhcpc_add_6rd_option.patch | |
| parent | 55f65c5c1dd4ccade263cbfedf8faad80a95904a (diff) | |
| download | master-31e0f0ae-5636037cff0f19ceb15c88999bbd1a77ada0d6fe.tar.gz master-31e0f0ae-5636037cff0f19ceb15c88999bbd1a77ada0d6fe.tar.bz2 master-31e0f0ae-5636037cff0f19ceb15c88999bbd1a77ada0d6fe.zip | |
busybox: remove two obsolete patches
They either work around missing implementations in uClibc 0.9.30 and
earlier and add already present functionality.
Closes #11210, #11211.
Signed-off-by: Jonas Gorski <jogo@openwrt.org>
SVN-Revision: 35710
Diffstat (limited to 'package/busybox/patches/244-udhcpc_add_6rd_option.patch')
| -rw-r--r-- | package/busybox/patches/244-udhcpc_add_6rd_option.patch | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/package/busybox/patches/244-udhcpc_add_6rd_option.patch b/package/busybox/patches/244-udhcpc_add_6rd_option.patch index b423ec98cc..2f0eadb160 100644 --- a/package/busybox/patches/244-udhcpc_add_6rd_option.patch +++ b/package/busybox/patches/244-udhcpc_add_6rd_option.patch @@ -9,7 +9,7 @@ { OPTION_STRING , 0xfc }, /* DHCP_WPAD */ /* Options below have no match in dhcp_option_strings[], -@@ -127,6 +129,8 @@ const char dhcp_option_strings[] ALIGN1 +@@ -127,6 +129,8 @@ const char dhcp_option_strings[] ALIGN1 "vlanpriority" "\0"/* DHCP_VLAN_PRIORITY */ #endif "msstaticroutes""\0"/* DHCP_MS_STATIC_ROUTES */ @@ -46,7 +46,7 @@ [OPTION_STRING ] = 1, [OPTION_STRING_HOST ] = 1, #if ENABLE_FEATURE_UDHCP_RFC3397 -@@ -124,6 +125,23 @@ static int sprint_nip(char *dest, const +@@ -124,6 +125,23 @@ static int sprint_nip(char *dest, const return sprintf(dest, "%s%u.%u.%u.%u", pre, ip[0], ip[1], ip[2], ip[3]); } @@ -70,10 +70,11 @@ /* really simple implementation, just count the bits */ static int mton(uint32_t mask) { -@@ -293,6 +311,70 @@ static NOINLINE char *xmalloc_optname_op +@@ -292,6 +310,70 @@ static NOINLINE char *xmalloc_optname_op + } return ret; - } ++ } + case OPTION_6RD: { + /* Option binary format: + * 0 1 2 3 @@ -137,7 +138,6 @@ + } + + return ret; -+ } + } #if ENABLE_FEATURE_UDHCP_RFC3397 case OPTION_DNS_STRING: - /* unpack option into dest; use ret for prefix (i.e., "optname=") */ |