net/mlx5e: Tunnel encap ETH header helper function

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>

diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en/tc_tun.c b/drivers/net/ethernet/mellanox/mlx5/core/en/tc_tun.c
index 0d24e96..f90c67c 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlx5/core/en/tc_tun.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/en/tc_tun.c
@@ -180,6 +180,19 @@ static int mlx5e_gen_ip_tunnel_header(char buf[], __u8 *ip_proto,
        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,
                                    struct net_device *mirred_dev,
                                    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 flowi4 fl4 = {};
        char *encap_header;
-       struct ethhdr *eth;
        u8 nud_state, ttl;
        struct iphdr *ip;
        int err;
@@ -242,13 +254,10 @@ int mlx5e_tc_tun_create_header_ipv4(struct mlx5e_priv *priv,
        read_unlock_bh(&n->lock);
 
        /* add ethernet header */
-       eth = (struct ethhdr *)encap_header;
-       ether_addr_copy(eth->h_dest, e->h_dest);
-       ether_addr_copy(eth->h_source, out_dev->dev_addr);
-       eth->h_proto = htons(ETH_P_IP);
+       ip = (struct iphdr *)gen_eth_tnl_hdr(encap_header, out_dev, e,
+                                            ETH_P_IP);
 
        /* add ip header */
-       ip = (struct iphdr *)((char *)eth + sizeof(struct ethhdr));
        ip->tos = tun_key->tos;
        ip->version = 0x4;
        ip->ihl = 0x5;
@@ -308,7 +317,6 @@ int mlx5e_tc_tun_create_header_ipv6(struct mlx5e_priv *priv,
        struct flowi6 fl6 = {};
        struct ipv6hdr *ip6h;
        char *encap_header;
-       struct ethhdr *eth;
        u8 nud_state, ttl;
        int err;
 
@@ -356,13 +364,10 @@ int mlx5e_tc_tun_create_header_ipv6(struct mlx5e_priv *priv,
        read_unlock_bh(&n->lock);
 
        /* add ethernet header */
-       eth = (struct ethhdr *)encap_header;
-       ether_addr_copy(eth->h_dest, e->h_dest);
-       ether_addr_copy(eth->h_source, out_dev->dev_addr);
-       eth->h_proto = htons(ETH_P_IPV6);
+       ip6h = (struct ipv6hdr *)gen_eth_tnl_hdr(encap_header, out_dev, e,
+                                                ETH_P_IPV6);
 
        /* add ip header */
-       ip6h = (struct ipv6hdr *)((char *)eth + sizeof(struct ethhdr));
        ip6_flow_hdr(ip6h, tun_key->tos, 0);
        /* the HW fills up ipv6 payload len */
        ip6h->hop_limit   = ttl;