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

Commit ef6fcd45 authored by Cong Wang's avatar Cong Wang Committed by David S. Miller
Browse files

mlx5: fix get_ip_proto() 



IP header is not necessarily located right after struct ethhdr,
there could be multiple 802.1Q headers in between, this is why
we call __vlan_get_protocol().

Fixes: fe1dc069 ("net/mlx5e: don't set CHECKSUM_COMPLETE on SCTP packets")
Cc: Alaa Hleihel <alaa@mellanox.com>
Cc: Or Gerlitz <ogerlitz@mellanox.com>
Cc: Saeed Mahameed <saeedm@mellanox.com>
Signed-off-by: default avatarCong Wang <xiyou.wangcong@gmail.com>
Reviewed-by: default avatarTariq Toukan <tariqt@mellanox.com>
Acked-by: default avatarSaeed Mahameed <saeedm@mellanox.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent a3d7e01d

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

+3 −3
Original line number Diff line number Diff line
@@ -724,9 +724,9 @@ static u32 mlx5e_get_fcs(const struct sk_buff *skb) 
	return __get_unaligned_cpu32(fcs_bytes);

}



static u8 get_ip_proto(struct sk_buff *skb, __be16 proto)

static u8 get_ip_proto(struct sk_buff *skb, int network_depth, __be16 proto)

{

	void *ip_p = skb->data + sizeof(struct ethhdr);

	void *ip_p = skb->data + network_depth;



	return (proto == htons(ETH_P_IP)) ? ((struct iphdr *)ip_p)->protocol :

					    ((struct ipv6hdr *)ip_p)->nexthdr;
@@ -755,7 +755,7 @@ static inline void mlx5e_handle_csum(struct net_device *netdev, 
		goto csum_unnecessary;



	if (likely(is_last_ethertype_ip(skb, &network_depth, &proto))) {

		if (unlikely(get_ip_proto(skb, proto) == IPPROTO_SCTP))

		if (unlikely(get_ip_proto(skb, network_depth, proto) == IPPROTO_SCTP))

			goto csum_unnecessary;



		skb->ip_summed = CHECKSUM_COMPLETE;