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

Commit 3ea4891d authored by Achiad Shochat's avatar Achiad Shochat Committed by David S. Miller
Browse files

net/mlx5e: Fix LSO vlan insertion 



Consider vlan insertion impact on headers copy size also for LSO
packets.

Signed-off-by: default avatarAchiad Shochat <achiad@mellanox.com>
Signed-off-by: default avatarOr Gerlitz <ogerlitz@mellanox.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent e4cf27bd

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

+3 −2
Original line number Diff line number Diff line
@@ -116,7 +116,7 @@ static inline u16 mlx5e_get_inline_hdr_size(struct mlx5e_sq *sq, 
	 * headers and occur before the data gather.

	 * Therefore these headers must be copied into the WQE

	 */

#define MLX5E_MIN_INLINE (ETH_HLEN + 2/*vlan tag*/)

#define MLX5E_MIN_INLINE ETH_HLEN



	if (bf && (skb_headlen(skb) <= sq->max_inline))

		return skb_headlen(skb);
@@ -128,7 +128,7 @@ static inline void mlx5e_insert_vlan(void *start, struct sk_buff *skb, u16 ihs) 
{

	struct vlan_ethhdr *vhdr = (struct vlan_ethhdr *)start;

	int cpy1_sz = 2 * ETH_ALEN;

	int cpy2_sz = ihs - cpy1_sz - VLAN_HLEN;

	int cpy2_sz = ihs - cpy1_sz;



	skb_copy_from_linear_data(skb, vhdr, cpy1_sz);

	skb_pull_inline(skb, cpy1_sz);
@@ -192,6 +192,7 @@ static netdev_tx_t mlx5e_sq_xmit(struct mlx5e_sq *sq, struct sk_buff *skb) 


	if (skb_vlan_tag_present(skb)) {

		mlx5e_insert_vlan(eseg->inline_hdr_start, skb, ihs);

		ihs += VLAN_HLEN;

	} else {

		skb_copy_from_linear_data(skb, eseg->inline_hdr_start, ihs);

		skb_pull_inline(skb, ihs);