Merge branch 'refactor/move_smartconfig_ack_to_wifi' into 'master'

smartconfig: move smartconfig_ack to esp_wifi conponent

Closes IDFGH-1758

See merge request espressif/esp-idf!5881

components/esp_wifi/CMakeLists.txt

@@ -10,9 +10,10 @@ idf_component_register(SRCS "src/coexist.c"
                             "src/phy_init.c"
                             "src/restore.c"
                             "src/smartconfig.c"
+                            "src/smartconfig_ack.c"
                             "src/wifi_init.c"
                     INCLUDE_DIRS "include" "${idf_target}/include"
-                    PRIV_REQUIRES wpa_supplicant nvs_flash smartconfig_ack
+                    PRIV_REQUIRES wpa_supplicant nvs_flash
                     LDFRAGMENTS "${ldfragments}")
 
 idf_build_get_property(build_dir BUILD_DIR)

components/lwip/Kconfig

@@ -90,6 +90,13 @@ menu "LWIP"
         help
             Enabling this option allows checking for available data on a netconn.
 
+    config LWIP_NETBUF_RECVINFO
+        bool "Enable IP_PKTINFO option"
+        default n
+        help
+            Enabling this option allows checking for the destination address
+            of a received IPv4 Packet.
+
     config LWIP_IP_FRAG
         bool "Enable fragment outgoing IP packets"
         default n

components/lwip/port/esp32/include/lwipopts.h

@@ -556,6 +556,12 @@
  */
 #define SO_REUSE_RXTOALL                CONFIG_LWIP_SO_REUSE_RXTOALL
 
+/**
+ * LWIP_NETBUF_RECVINFO==1: Enable IP_PKTINFO option.
+ * This option is set via menuconfig.
+ */
+#define LWIP_NETBUF_RECVINFO            CONFIG_LWIP_NETBUF_RECVINFO
+
 /*
    ----------------------------------------
    ---------- Statistics options ----------

components/smartconfig_ack/CMakeLists.txt

@@ -1,3 +0,0 @@
-idf_component_register(SRCS "smartconfig_ack.c"
-                    INCLUDE_DIRS include
-                    PRIV_REQUIRES lwip tcpip_adapter)

components/smartconfig_ack/component.mk

@@ -1,2 +0,0 @@
-#
-# Component Makefile