Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4382c7b9 authored by Gal Pressman's avatar Gal Pressman Committed by Saeed Mahameed
Browse files

net/mlx5e: Add 802.1ad VLAN insertion support 



Report VLAN insertion support for S-tagged packets and add support by
choosing the correct VLAN type in the WQE.

Signed-off-by: default avatarGal Pressman <galp@mellanox.com>
Reviewed-by: default avatarTariq Toukan <tariqt@mellanox.com>
Signed-off-by: default avatarSaeed Mahameed <saeedm@mellanox.com>
parent 7d92d580

drivers/net/ethernet/mellanox/mlx5/core/en_main.c

+1 −0
Original line number Diff line number Diff line
@@ -4194,6 +4194,7 @@ static void mlx5e_build_nic_netdev(struct net_device *netdev) 
	netdev->hw_features      |= NETIF_F_HW_VLAN_CTAG_TX;

	netdev->hw_features      |= NETIF_F_HW_VLAN_CTAG_RX;

	netdev->hw_features      |= NETIF_F_HW_VLAN_CTAG_FILTER;

	netdev->hw_features      |= NETIF_F_HW_VLAN_STAG_TX;



	if (mlx5e_vxlan_allowed(mdev) || MLX5_CAP_ETH(mdev, tunnel_stateless_gre)) {

		netdev->hw_features     |= NETIF_F_GSO_PARTIAL;

drivers/net/ethernet/mellanox/mlx5/core/en_tx.c

+2 −0
Original line number Diff line number Diff line
@@ -369,6 +369,8 @@ static netdev_tx_t mlx5e_sq_xmit(struct mlx5e_txqsq *sq, struct sk_buff *skb, 
		ds_cnt += DIV_ROUND_UP(ihs - sizeof(eseg->inline_hdr.start), MLX5_SEND_WQE_DS);

	} else if (skb_vlan_tag_present(skb)) {

		eseg->insert.type = cpu_to_be16(MLX5_ETH_WQE_INSERT_VLAN);

		if (skb->vlan_proto == cpu_to_be16(ETH_P_8021AD))

			eseg->insert.type |= cpu_to_be16(MLX5_ETH_WQE_SVLAN);

		eseg->insert.vlan_tci = cpu_to_be16(skb_vlan_tag_get(skb));

	}

include/linux/mlx5/qp.h

+1 −0
Original line number Diff line number Diff line
@@ -221,6 +221,7 @@ enum { 
};



enum {

	MLX5_ETH_WQE_SVLAN              = 1 << 0,

	MLX5_ETH_WQE_INSERT_VLAN        = 1 << 15,

};