Merge branch 'bugfix/remove_server_id_option_in_dhcp_renew_pkt' into 'release/v2.2.x'

xcguang · xcguang · commit fb644c1f3443 · 2019-02-24T16:53:59.000+08:00
fix(lwip): remove server id option in dhcp renew packet

See merge request sdk/ESP8266_NONOS_SDK!132
diff --git a/VERSION b/VERSION
@@ -18,5 +18,5 @@ phy:
 
 gitlab:
     driver      :   68fc7b06
-    lwip        :   92d608a9
-    mbedtls     :   e4dace14
+    lwip        :   863c3eea
+    mbedtls     :   e4dace14
diff --git a/lib/liblwip.a b/lib/liblwip.a
diff --git a/third_party/lwip/core/dhcp.c b/third_party/lwip/core/dhcp.c
@@ -1099,12 +1099,12 @@ dhcp_renew(struct netif *netif)
     }
 #endif /* LWIP_NETIF_HOSTNAME */
 
-#if 1
+#if 0
     dhcp_option(dhcp, DHCP_OPTION_REQUESTED_IP, 4);
     dhcp_option_long(dhcp, ntohl(dhcp->offered_ip_addr.addr));
 #endif
 
-#if 1
+#if 0
     dhcp_option(dhcp, DHCP_OPTION_SERVER_ID, 4);
     dhcp_option_long(dhcp, ntohl(dhcp->server_ip_addr.addr));
 #endif
