Thread (4 messages) 4 messages, 4 authors, 2018-12-01

Re: [Patch net] mlx5: fix get_ip_proto()

From: Tariq Toukan <hidden>
Date: 2018-11-30 00:19:13


On 29/11/2018 1:04 AM, Cong Wang wrote:
quoted hunk ↗ jump to hunk
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: fe1dc069990c ("net/mlx5e: don't set CHECKSUM_COMPLETE on SCTP packets")
Cc: Alaa Hleihel <redacted>
Cc: Or Gerlitz <redacted>
Cc: Saeed Mahameed <redacted>
Signed-off-by: Cong Wang <redacted>
---
  drivers/net/ethernet/mellanox/mlx5/core/en_rx.c | 6 +++---
  1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en_rx.c b/drivers/net/ethernet/mellanox/mlx5/core/en_rx.c
index 9b6bd2b51556..f7c5dbb0ffcd 100644
--- a/drivers/net/ethernet/mellanox/mlx5/core/en_rx.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/en_rx.c
@@ -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;
@@ -786,7 +786,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;
LGTM. Thanks for you patch, Cong.

Reviewed-by: Tariq Toukan <redacted>
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help