diff options
| author | David S. Miller <davem@davemloft.net> | 2020-08-04 03:24:30 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2020-08-04 03:24:30 +0200 |
| commit | 76769c38b45d94f5492ff9be363ac7007fd8e58b (patch) | |
| tree | fcbbbc1a7d5b696fc99db8ecab5cb0d55e1f8a98 /include/net | |
| parent | Merge branch 'sfc-driver-for-EF100-family-NICs-part-2' (diff) | |
| parent | net/mlx5: Delete extra dump stack that gives nothing (diff) | |
| download | linux-76769c38b45d94f5492ff9be363ac7007fd8e58b.tar.xz linux-76769c38b45d94f5492ff9be363ac7007fd8e58b.zip | |
Merge tag 'mlx5-updates-2020-08-03' of git://git.kernel.org/pub/scm/linux/kernel/git/saeed/linux
Saeed Mahameed says:
====================
mlx5-updates-2020-08-03
This patchset introduces some updates to mlx5 driver.
1) Jakub converts mlx5 to use the new udp tunnel infrastructure.
Starting with a hack to allow drivers to request a static configuration
of the default vxlan port, and then a patch that converts mlx5.
2) Parav implements change_carrier ndo for VF eswitch representors,
to speedup link state control of representors netdevices.
3) Alex Vesker, makes a simple update to software steering to fix an issue
with push vlan action sequence
4) Leon removes a redundant dump stack on error flow.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/net')
| -rw-r--r-- | include/net/udp_tunnel.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/include/net/udp_tunnel.h b/include/net/udp_tunnel.h index dd20ce99740c..94bb7a882250 100644 --- a/include/net/udp_tunnel.h +++ b/include/net/udp_tunnel.h @@ -193,6 +193,11 @@ enum udp_tunnel_nic_info_flags { UDP_TUNNEL_NIC_INFO_OPEN_ONLY = BIT(1), /* Device supports only IPv4 tunnels */ UDP_TUNNEL_NIC_INFO_IPV4_ONLY = BIT(2), + /* Device has hard-coded the IANA VXLAN port (4789) as VXLAN. + * This port must not be counted towards n_entries of any table. + * Driver will not receive any callback associated with port 4789. + */ + UDP_TUNNEL_NIC_INFO_STATIC_IANA_VXLAN = BIT(3), }; /** |