net/mlx5e: Support VLAN encap ETH header generation

Support generation of native or tagged Ethernet header for encap
header, depending on provided net device.

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 bcf08f5abc2fcfd2f69196920d9c6313de95b72d..a6990744730a076b4c200ab2509cd945c2caf902 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlx5/core/en/tc_tun.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/en/tc_tun.c
@@ -185,12 +185,23 @@ static char *gen_eth_tnl_hdr(char *buf, struct net_device *dev,
                             u16 proto)
 {
        struct ethhdr *eth = (struct ethhdr *)buf;
+       char *ip;
 
        ether_addr_copy(eth->h_dest, e->h_dest);
        ether_addr_copy(eth->h_source, dev->dev_addr);
-       eth->h_proto = htons(proto);
+       if (is_vlan_dev(dev)) {
+               struct vlan_hdr *vlan = (struct vlan_hdr *)
+                                       ((char *)eth + ETH_HLEN);
+               ip = (char *)vlan + VLAN_HLEN;
+               eth->h_proto = vlan_dev_vlan_proto(dev);
+               vlan->h_vlan_TCI = htons(vlan_dev_vlan_id(dev));
+               vlan->h_vlan_encapsulated_proto = htons(proto);
+       } else {
+               eth->h_proto = htons(proto);
+               ip = (char *)eth + ETH_HLEN;
+       }
 
-       return (char *)eth + ETH_HLEN;
+       return ip;
 }
 
 int mlx5e_tc_tun_create_header_ipv4(struct mlx5e_priv *priv,