Crash_Override/OVMS3-idf
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge branch 'feature/add_ETHARP_SUPPORT_VLAN' into 'release/v3.3'

Browse source 
lw-ip:add feature ETHARP SUPPORT VLAN

See merge request espressif/esp-idf!7399
This commit is contained in:
Jiang Jiang Jian 2020-02-14 19:48:09 +08:00
parent f41e536f06 4f0ee78558
commit fdceac415b
2 changed files with 21 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
components/lwip/Kconfig
View file

@ -16,6 +16,16 @@ menu "LWIP"
Please make sure you fully understand the impact of this feature before
enabling it.
config ETHARP_SUPPORT_VLAN
bool "Support receiving and sending ethernet packets with VLAN header"
default n
help
ETHARP_SUPPORT_VLAN==1: support receiving and sending ethernet packets with
VLAN header. See the description of LWIP_HOOK_VLAN_CHECK and LWIP_HOOK_VLAN_SET
hooks to check/set VLAN headers.
If ETHARP_VLAN_CHECK is defined, only VLAN-traffic for this VLAN is accepted.
If ETHARP_VLAN_CHECK is not defined, all traffic is accepted.
config LWIP_IRAM_OPTIMIZATION
bool "Enable LWIP IRAM optimization"
default n

11
components/lwip/port/esp32/include/lwipopts.h
View file

@ -738,6 +738,17 @@
*/
#define ETHARP_TRUST_IP_MAC CONFIG_LWIP_ETHARP_TRUST_IP_MAC
/**
* ETHARP_SUPPORT_VLAN==1: support receiving and sending ethernet packets with
* VLAN header. See the description of LWIP_HOOK_VLAN_CHECK and
* LWIP_HOOK_VLAN_SET hooks to check/set VLAN headers.
* Additionally, you can define ETHARP_VLAN_CHECK to an u16_t VLAN ID to check.
* If ETHARP_VLAN_CHECK is defined, only VLAN-traffic for this VLAN is accepted.
* If ETHARP_VLAN_CHECK is not defined, all traffic is accepted.
* Alternatively, define a function/define ETHARP_VLAN_CHECK_FN(eth_hdr, vlan)
* that returns 1 to accept a packet or 0 to drop a packet.
*/
#define ETHARP_SUPPORT_VLAN CONFIG_ETHARP_SUPPORT_VLAN
/**
* POSIX I/O functions are mapped to LWIP via the VFS layer