diff options
| author | Renato Botelho <renato@netgate.com> | 2018-06-08 15:31:00 -0400 |
|---|---|---|
| committer | Renato Botelho <renato@netgate.com> | 2018-06-08 15:31:00 -0400 |
| commit | d2f6c1213c85dcb4ceade81e8f3f372ed29ee633 (patch) | |
| tree | 33b56ee5a6858022b6df3e29936cbdf04bec4d32 /sbin | |
| parent | aced14badb827f6cb36f8b73c04098a4a76048f2 (diff) | |
| download | FreeBSD-src-d2f6c1213c85dcb4ceade81e8f3f372ed29ee633.zip FreeBSD-src-d2f6c1213c85dcb4ceade81e8f3f372ed29ee633.tar.gz | |
Revert "Import dhclient patch from FreeBSD bz 206721"
This reverts commit 2f66803611bf19db8e0b634be8c9464febc394e5.
Diffstat (limited to 'sbin')
| -rw-r--r-- | sbin/dhclient/dhclient.c | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/sbin/dhclient/dhclient.c b/sbin/dhclient/dhclient.c index 652f99c..070fcf5 100644 --- a/sbin/dhclient/dhclient.c +++ b/sbin/dhclient/dhclient.c @@ -828,13 +828,7 @@ bind_lease(struct interface_info *ip) opt = &ip->client->new->options[DHO_INTERFACE_MTU]; if (opt->len == sizeof(u_int16_t)) { - u_int16_t mtu = 0; - if (ip->client->config->default_actions[DHO_INTERFACE_MTU] == - ACTION_SUPERSEDE) - mtu = getUShort(ip->client->config->defaults[DHO_INTERFACE_MTU].data); - else - mtu = be16dec(opt->data); - + u_int16_t mtu = be16dec(opt->data); if (mtu < MIN_MTU) warning("mtu size %u < %d: ignored", (unsigned)mtu, MIN_MTU); else |
