瀏覽代碼

Merge branch 'bugfix/support_sniffer_capture_fcs_err_packets' into 'master'

esp_wifi: Add FCS failed packets filter

Closes WIFI-3194, IDF-1832, and WIFI-892

See merge request espressif/esp-idf!11700
Jiang Jiang Jian 5 年之前
父節點
當前提交
22fded3acf
共有 3 個文件被更改,包括 15 次插入5 次删除
  1. 9 0
      components/esp32/ld/esp32_fragments.lf
  2. 5 4
      components/esp_wifi/include/esp_wifi_types.h
  3. 1 1
      components/esp_wifi/lib

+ 9 - 0
components/esp32/ld/esp32_fragments.lf

@@ -92,6 +92,10 @@ entries:
 entries:
     .wifirxiram+
 
+[sections:phy_iram]
+entries:
+    .phyiram+
+
 [scheme:default]
 entries:
     if APP_BUILD_USE_FLASH_SECTIONS = y:
@@ -118,6 +122,7 @@ entries:
     rtc_bss -> rtc_bss
     wifi_iram -> flash_text
     wifi_rx_iram -> flash_text
+    phy_iram -> flash_text
     dram_coredump -> dram_coredump
     iram_coredump -> iram_coredump
     rtc_coredump -> rtc_coredump
@@ -152,6 +157,10 @@ entries:
 entries:
     wifi_rx_iram -> iram0_text
 
+[scheme:phy_iram]
+entries:
+    phy_iram -> iram0_text
+
 [scheme:extram_bss]
 entries:
     bss -> extern_ram

+ 5 - 4
components/esp_wifi/include/esp_wifi_types.h

@@ -30,10 +30,10 @@ typedef enum {
     WIFI_MODE_MAX
 } wifi_mode_t;
 
-typedef esp_interface_t wifi_interface_t;
-
-#define WIFI_IF_STA ESP_IF_WIFI_STA
-#define WIFI_IF_AP  ESP_IF_WIFI_AP
+typedef enum {
+    WIFI_IF_STA = ESP_IF_WIFI_STA,
+    WIFI_IF_AP  = ESP_IF_WIFI_AP,
+} wifi_interface_t;
 
 typedef enum {
     WIFI_COUNTRY_POLICY_AUTO,   /**< Country policy is auto, use the country info of AP to which the station is connected */
@@ -392,6 +392,7 @@ typedef enum {
 #define WIFI_PROMIS_FILTER_MASK_MISC        (1<<3)        /**< filter the packets with type of WIFI_PKT_MISC */
 #define WIFI_PROMIS_FILTER_MASK_DATA_MPDU   (1<<4)        /**< filter the MPDU which is a kind of WIFI_PKT_DATA */
 #define WIFI_PROMIS_FILTER_MASK_DATA_AMPDU  (1<<5)        /**< filter the AMPDU which is a kind of WIFI_PKT_DATA */
+#define WIFI_PROMIS_FILTER_MASK_FCSFAIL     (1<<6)        /**< filter the FCS failed packets, do not open it in general */
 
 #define WIFI_PROMIS_CTRL_FILTER_MASK_ALL         (0xFF800000)  /**< filter all control packets */
 #define WIFI_PROMIS_CTRL_FILTER_MASK_WRAPPER     (1<<23)       /**< filter the control packets with subtype of Control Wrapper */

+ 1 - 1
components/esp_wifi/lib

@@ -1 +1 @@
-Subproject commit 8fa1751c0d9d082952d275e16086bacb225409a9
+Subproject commit b7dc7bb088473d638765b5a0798ed0f23bb01aad