iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

net/mlx5e: Tunnel encap ETH header helper function

Browse Source 
In tunnel encap we prepare the encap header for IPv4/6 cases, in two
separate functions. For ETH header generation the code is almost
duplicated.

Move the ETH header generation code from IPv4/6 functions to a helper
function, with no functional change.

Signed-off-by: Eli Britstein <elibr@mellanox.com>
Reviewed-by: Roi Dayan <roid@mellanox.com>
Signed-off-by: Saeed Mahameed <saeedm@mellanox.com>
This commit is contained in:
Eli Britstein
2018-12-09 09:17:18 +02:00
committed by Saeed Mahameed
parent b168cff0b9
commit 05ada1adb6
1 changed files with 17 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
drivers/net/ethernet/mellanox/mlx5/core/en/tc_tun.c
View File

@@ -180,6 +180,19 @@ static int mlx5e_gen_ip_tunnel_header(char buf[], __u8 *ip_proto,
return err; return err;
} }
static char *gen_eth_tnl_hdr(char *buf, struct net_device *dev,
struct mlx5e_encap_entry *e,
u16 proto)
{
struct ethhdr *eth = (struct ethhdr *)buf;
ether_addr_copy(eth->h_dest, e->h_dest);
ether_addr_copy(eth->h_source, dev->dev_addr);
eth->h_proto = htons(proto);
return (char *)eth + ETH_HLEN;
}
int mlx5e_tc_tun_create_header_ipv4(struct mlx5e_priv *priv, int mlx5e_tc_tun_create_header_ipv4(struct mlx5e_priv *priv,
struct net_device *mirred_dev, struct net_device *mirred_dev,
struct mlx5e_encap_entry *e) struct mlx5e_encap_entry *e)
@@ -193,7 +206,6 @@ int mlx5e_tc_tun_create_header_ipv4(struct mlx5e_priv *priv,
struct neighbour *n = NULL; struct neighbour *n = NULL;
struct flowi4 fl4 = {}; struct flowi4 fl4 = {};
char *encap_header; char *encap_header;
struct ethhdr *eth;
u8 nud_state, ttl; u8 nud_state, ttl;
struct iphdr *ip; struct iphdr *ip;
int err; int err;
@@ -242,13 +254,10 @@ int mlx5e_tc_tun_create_header_ipv4(struct mlx5e_priv *priv,
read_unlock_bh(&n->lock); read_unlock_bh(&n->lock);
/* add ethernet header */ /* add ethernet header */
eth = (struct ethhdr *)encap_header; ip = (struct iphdr *)gen_eth_tnl_hdr(encap_header, out_dev, e,
ether_addr_copy(eth->h_dest, e->h_dest); ETH_P_IP);
ether_addr_copy(eth->h_source, out_dev->dev_addr);
eth->h_proto = htons(ETH_P_IP);
/* add ip header */ /* add ip header */
ip = (struct iphdr *)((char *)eth + sizeof(struct ethhdr));
ip->tos = tun_key->tos; ip->tos = tun_key->tos;
ip->version = 0x4; ip->version = 0x4;
ip->ihl = 0x5; ip->ihl = 0x5;
@@ -308,7 +317,6 @@ int mlx5e_tc_tun_create_header_ipv6(struct mlx5e_priv *priv,
struct flowi6 fl6 = {}; struct flowi6 fl6 = {};
struct ipv6hdr *ip6h; struct ipv6hdr *ip6h;
char *encap_header; char *encap_header;
struct ethhdr *eth;
u8 nud_state, ttl; u8 nud_state, ttl;
int err; int err;
@@ -356,13 +364,10 @@ int mlx5e_tc_tun_create_header_ipv6(struct mlx5e_priv *priv,
read_unlock_bh(&n->lock); read_unlock_bh(&n->lock);
/* add ethernet header */ /* add ethernet header */
eth = (struct ethhdr *)encap_header; ip6h = (struct ipv6hdr *)gen_eth_tnl_hdr(encap_header, out_dev, e,
ether_addr_copy(eth->h_dest, e->h_dest); ETH_P_IPV6);
ether_addr_copy(eth->h_source, out_dev->dev_addr);
eth->h_proto = htons(ETH_P_IPV6);
/* add ip header */ /* add ip header */
ip6h = (struct ipv6hdr *)((char *)eth + sizeof(struct ethhdr));
ip6_flow_hdr(ip6h, tun_key->tos, 0); ip6_flow_hdr(ip6h, tun_key->tos, 0);
/* the HW fills up ipv6 payload len */ /* the HW fills up ipv6 payload len */
ip6h->hop_limit = ttl; ip6h->hop_limit = ttl;