diff options
| author | Jo-Philipp Wich <jow@openwrt.org> | 2010-12-04 19:15:16 +0000 |
|---|---|---|
| committer | Jo-Philipp Wich <jow@openwrt.org> | 2010-12-04 19:15:16 +0000 |
| commit | 56ae0b91e2b08689f705f57fdb93dd88a87400a7 (patch) | |
| tree | c873bfbf81fc239b5eb3df47fc77c5912a4eb271 /package/busybox/patches | |
| parent | 2d2fbc6f843546aa0641035e7b1520e0d947ada5 (diff) | |
| download | upstream-56ae0b91e2b08689f705f57fdb93dd88a87400a7.tar.gz upstream-56ae0b91e2b08689f705f57fdb93dd88a87400a7.tar.bz2 upstream-56ae0b91e2b08689f705f57fdb93dd88a87400a7.zip | |
busybox: Comcast uses option 150 for 6RD DHCP announcements, cover it
SVN-Revision: 24245
Diffstat (limited to 'package/busybox/patches')
| -rw-r--r-- | package/busybox/patches/244-udhcpc_add_6rd_option.patch | 12 | ||||
| -rw-r--r-- | package/busybox/patches/524-udhcpc_renew.patch | 2 |
2 files changed, 8 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 3037708586..0bf6ff0f4b 100644 --- a/package/busybox/patches/244-udhcpc_add_6rd_option.patch +++ b/package/busybox/patches/244-udhcpc_add_6rd_option.patch @@ -1,22 +1,24 @@ --- a/networking/udhcp/common.c +++ b/networking/udhcp/common.c -@@ -54,6 +54,7 @@ const struct dhcp_optflag dhcp_optflags[ +@@ -54,6 +54,8 @@ const struct dhcp_optflag dhcp_optflags[ { OPTION_SIP_SERVERS , 0x78 }, /* DHCP_SIP_SERVERS */ #endif { OPTION_STATIC_ROUTES , 0x79 }, /* DHCP_STATIC_ROUTES */ -+ { OPTION_6RD , 0xd4 }, /* DHCP_6RD */ ++ { OPTION_6RD , 0xd4 }, /* DHCP_6RD (RFC) */ ++ { OPTION_6RD , 0x96 }, /* DHCP_6RD (Comcast) */ { OPTION_STRING , 0xfc }, /* DHCP_WPAD */ /* Options below have no match in dhcp_option_strings[], -@@ -114,6 +115,7 @@ const char dhcp_option_strings[] ALIGN1 +@@ -114,6 +116,8 @@ const char dhcp_option_strings[] ALIGN1 // doesn't work in udhcpd.conf since OPTION_STATIC_ROUTES // is not handled yet by "string->option" conversion code: "staticroutes" "\0"/* DHCP_STATIC_ROUTES */ -+ "ip6rd" "\0" /* DHCP_6RD */ ++ "ip6rd" "\0" /* DHCP_6RD (RFC) */ ++ "ip6rd" "\0" /* DHCP_6RD (Comcast) */ "wpad" "\0" /* DHCP_WPAD */ ; -@@ -141,6 +143,7 @@ const uint8_t dhcp_option_lengths[] ALIG +@@ -141,6 +145,7 @@ const uint8_t dhcp_option_lengths[] ALIG [OPTION_S32] = 4, /* Just like OPTION_STRING, we use minimum length here */ [OPTION_STATIC_ROUTES] = 5, diff --git a/package/busybox/patches/524-udhcpc_renew.patch b/package/busybox/patches/524-udhcpc_renew.patch index 2a72755349..2a8e1c1449 100644 --- a/package/busybox/patches/524-udhcpc_renew.patch +++ b/package/busybox/patches/524-udhcpc_renew.patch @@ -1,6 +1,6 @@ --- a/networking/udhcp/dhcpc.c +++ b/networking/udhcp/dhcpc.c -@@ -711,7 +711,6 @@ static void perform_renew(void) +@@ -793,7 +793,6 @@ static void perform_renew(void) state = RENEW_REQUESTED; break; case RENEW_REQUESTED: /* impatient are we? fine, square 1 */ |