espressif/esp-idf
1
0
Fork 1
mirror of https://github.com/espressif/esp-idf.git synced 2025-07-31 19:24:33 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'bugfix/ip_mesh_transmit_wrap' into 'master'

Browse Source 
esp_mesh: Fix internal ip mesh example to use transmit wrap function

Closes IDFGH-4208

See merge request espressif/esp-idf!10745
This commit is contained in:
David Čermák
2020-11-10 06:05:36 +08:00
parent 0032971311 fb0f7e9077
commit 903d7f1c35
3 changed files with 19 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
examples/mesh/ip_internal_network/main/mesh_netif.c
View File

@@ -167,9 +167,10 @@ static esp_err_t mesh_netif_transmit_from_root_ap(void *h, void *buffer, size_t
}
return ESP_OK;
}
// Construct and Destruct functions
//
static esp_err_t mesh_netif_transmit_from_root_ap_wrap(void *h, void *buffer, size_t len, void *netstack_buf)
{
return mesh_netif_transmit_from_root_ap(h, buffer, len);
}
static esp_err_t mesh_netif_transmit_from_node_sta(void *h, void *buffer, size_t len)
{
@@ -186,6 +187,13 @@ static esp_err_t mesh_netif_transmit_from_node_sta(void *h, void *buffer, size_t
return err;
}
static esp_err_t mesh_netif_transmit_from_node_sta_wrap(void *h, void *buffer, size_t len, void *netstack_buf)
{
return mesh_netif_transmit_from_node_sta(h, buffer, len);
}
// Construct and Destruct functions
//
static esp_err_t mesh_driver_start_root_ap(esp_netif_t * esp_netif, void * args)
{
mesh_netif_driver_t driver = args;
@@ -193,6 +201,7 @@ static esp_err_t mesh_driver_start_root_ap(esp_netif_t * esp_netif, void * args)
esp_netif_driver_ifconfig_t driver_ifconfig = {
.handle = driver,
.transmit = mesh_netif_transmit_from_root_ap,
.transmit_wrap = mesh_netif_transmit_from_root_ap_wrap,
.driver_free_rx_buffer = mesh_free
};
@@ -206,6 +215,7 @@ static esp_err_t mesh_driver_start_node_sta(esp_netif_t * esp_netif, void * args
esp_netif_driver_ifconfig_t driver_ifconfig = {
.handle = driver,
.transmit = mesh_netif_transmit_from_node_sta,
.transmit_wrap = mesh_netif_transmit_from_node_sta_wrap,
.driver_free_rx_buffer = mesh_free
};

6
examples/mesh/ip_internal_network/sdkconfig.defaults
View File

@@ -4,4 +4,8 @@ CONFIG_LWIP_IP_FORWARD=y
CONFIG_LWIP_IPV4_NAPT=y
CONFIG_LWIP_TCP_MSS=624
CONFIG_LWIP_TCP_OVERSIZE_MSS=y
CONFIG_PARTITION_TABLE_CUSTOM=y
CONFIG_PARTITION_TABLE_CUSTOM_FILENAME="partitions.csv"
CONFIG_PARTITION_TABLE_FILENAME="partitions.csv"
CONFIG_PARTITION_TABLE_OFFSET=0x8000
CONFIG_PARTITION_TABLE_MD5=y

2
tools/ci/config/target-test.yml
View File

@@ -479,7 +479,7 @@ UT_034:
UT_035:
extends: .unit_test_s2_template
parallel: 44
parallel: 45
tags:
- ESP32S2_IDF
- UT_T1_1