diff options
author | tk.mun <tk.mun@samsung.com> | 2011-12-06 16:59:35 -0800 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2011-12-06 16:59:35 -0800 |
commit | 62bc4775ef99e3369b10fb4bd30df0cc83e18713 (patch) | |
tree | 10bd1573eb37b116bc63c8b5bb284befe182bd7f | |
parent | 733caa815709ef629b67fbf33ddba7c553930cdb (diff) | |
parent | ddaa48f57b54b2862b3e6dcf18a44c9647f3baaa (diff) | |
download | external_dhcpcd-62bc4775ef99e3369b10fb4bd30df0cc83e18713.zip external_dhcpcd-62bc4775ef99e3369b10fb4bd30df0cc83e18713.tar.gz external_dhcpcd-62bc4775ef99e3369b10fb4bd30df0cc83e18713.tar.bz2 |
am ddaa48f5: wimax : Fix for some DHCP servers not returning some DNS info
* commit 'ddaa48f57b54b2862b3e6dcf18a44c9647f3baaa':
wimax : Fix for some DHCP servers not returning some DNS info
-rw-r--r-- | dhcp.c | 8 |
1 files changed, 6 insertions, 2 deletions
@@ -78,7 +78,9 @@ static const struct dhcp_opt const dhcp_opts[] = { { 2, UINT32, "time_offset" }, { 4, IPV4 | ARRAY, "time_servers" }, { 5, IPV4 | ARRAY, "ien116_name_servers" }, - { 6, IPV4 | ARRAY, "domain_name_servers" }, + /* Explicitly include DNS in the list of parameters requested in the DNS request. + * Without this some DHCP servers may skip the DNS entries in the DHCP replies.*/ + { 6, IPV4 | ARRAY | REQUEST, "domain_name_servers" }, { 7, IPV4 | ARRAY, "log_servers" }, { 8, IPV4 | ARRAY, "cookie_servers" }, { 9, IPV4 | ARRAY, "lpr_servers" }, @@ -87,7 +89,9 @@ static const struct dhcp_opt const dhcp_opts[] = { { 12, STRING, "host_name" }, { 13, UINT16, "boot_size" }, { 14, STRING, "merit_dump" }, - { 15, STRING, "domain_name" }, + /* Explicitly include DNS in the list of parameters requested in the DNS request. + * Without this some DHCP servers may skip the DNS entries in the DHCP replies.*/ + { 15, STRING | REQUEST, "domain_name" }, { 16, IPV4, "swap_server" }, { 17, STRING, "root_path" }, { 18, STRING, "extensions_path" }, |