diff --git a/components/esp_wifi/lib b/components/esp_wifi/lib
index 7a103b60ff..cfceb15dc5 160000
--- a/components/esp_wifi/lib
+++ b/components/esp_wifi/lib
@@ -1 +1 @@
-Subproject commit 7a103b60ff1a49b0a4ab42333765d7fb590d9b97
+Subproject commit cfceb15dc595cdba9172b1c3865d139a25388fcf
diff --git a/components/wpa_supplicant/port/include/os.h b/components/wpa_supplicant/port/include/os.h
index e34d85f615..3ed465b3ae 100644
--- a/components/wpa_supplicant/port/include/os.h
+++ b/components/wpa_supplicant/port/include/os.h
@@ -24,7 +24,8 @@
 #include "esp_private/esp_wifi_private.h"
 #include "esp_wifi.h"
 
-typedef time_t os_time_t;
+/* Modifying datatype for platform and compiler independence */
+typedef uint64_t os_time_t;
 
 /**
  * os_sleep - Sleep (sec, usec)
diff --git a/components/wpa_supplicant/src/wps/wps_registrar.c b/components/wpa_supplicant/src/wps/wps_registrar.c
index a7edf79ff6..462e16c5df 100644
--- a/components/wpa_supplicant/src/wps/wps_registrar.c
+++ b/components/wpa_supplicant/src/wps/wps_registrar.c
@@ -1209,7 +1209,9 @@ void wps_registrar_probe_req_rx(struct wps_registrar *reg, const u8 *addr,
 		struct os_reltime now, dur;
 		os_get_reltime(&now);
 		os_reltime_sub(&now, &reg->pbc_ignore_start, &dur);
-		if (dur.sec >= 0 && dur.sec < 5) {
+#ifdef ESP_SUPPLICANT
+		if (dur.sec < 5) {
+#endif /* ESP_SUPPLICANT */
 			wpa_printf(MSG_DEBUG, "WPS: Ignore PBC activation "
 				   "based on Probe Request from the Enrollee "
 				   "that just completed PBC provisioning");