diff options
| author | Or Gerlitz | 2017-04-25 15:19:26 +0200 |
|---|---|---|
| committer | Saeed Mahameed | 2017-04-30 15:03:07 +0200 |
| commit | c1ae11521b1e87523553ddd3c1aa88be3d710c96 (patch) | |
| tree | 9724a918f599fe403f115b6c0d3e73f76f20d9b2 /drivers/net/ethernet/mellanox/mlx5/core/eswitch.h | |
| parent | net/mlx5: Remove encap entry pointer from the eswitch flow attributes (diff) | |
| download | kernel-qcow2-linux-c1ae11521b1e87523553ddd3c1aa88be3d710c96.tar.gz kernel-qcow2-linux-c1ae11521b1e87523553ddd3c1aa88be3d710c96.tar.xz kernel-qcow2-linux-c1ae11521b1e87523553ddd3c1aa88be3d710c96.zip | |
net/mlx5e: Move the encap entry structure from the eswitch header
The encap entry structure isn't manipulated by the eswitch code,
hence it can/needs to be removed from the eswitch header.
Do that, and change it to have mlx5e_ prefix.
This patch doesn't change any functionality.
Signed-off-by: Or Gerlitz <ogerlitz@mellanox.com>
Signed-off-by: Saeed Mahameed <saeedm@mellanox.com>
Diffstat (limited to 'drivers/net/ethernet/mellanox/mlx5/core/eswitch.h')
| -rw-r--r-- | drivers/net/ethernet/mellanox/mlx5/core/eswitch.h | 13 |
1 files changed, 0 insertions, 13 deletions
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/eswitch.h b/drivers/net/ethernet/mellanox/mlx5/core/eswitch.h index 9056961689fa..751a673de97a 100644 --- a/drivers/net/ethernet/mellanox/mlx5/core/eswitch.h +++ b/drivers/net/ethernet/mellanox/mlx5/core/eswitch.h @@ -36,7 +36,6 @@ #include <linux/if_ether.h> #include <linux/if_link.h> #include <net/devlink.h> -#include <net/ip_tunnels.h> #include <linux/mlx5/device.h> #define MLX5_MAX_UC_PER_VPORT(dev) \ @@ -289,18 +288,6 @@ enum { #define MLX5_FLOW_CONTEXT_ACTION_VLAN_POP 0x4000 #define MLX5_FLOW_CONTEXT_ACTION_VLAN_PUSH 0x8000 -struct mlx5_encap_entry { - struct hlist_node encap_hlist; - struct list_head flows; - u32 encap_id; - struct neighbour *n; - struct ip_tunnel_info tun_info; - unsigned char h_dest[ETH_ALEN]; /* destination eth addr */ - - struct net_device *out_dev; - int tunnel_type; -}; - struct mlx5_esw_flow_attr { struct mlx5_eswitch_rep *in_rep; struct mlx5_eswitch_rep *out_rep; |