Patch "net/mlx5e: Fix loopback self test when GRO is off" has been added to the 4.15-stable tree
This is a note to let you know that I've just added the patch titled
net/mlx5e: Fix loopback self test when GRO is off
to the 4.15-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
net-mlx5e-fix-loopback-self-test-when-gro-is-off.patch
and it can be found in the queue-4.15 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.
Quoted 1 line
From foo@baz Tue Mar 6 19:02:56 PST 2018
From: Inbar Karmy <[email protected]>
Date: Thu, 7 Dec 2017 17:26:33 +0200
Subject: net/mlx5e: Fix loopback self test when GRO is off
From: Inbar Karmy <[email protected]>
[ Upstream commit ef7a3518f7dd4f4cf5e5b5358c93d1eb78df28fb ]
When GRO is off, the transport header pointer in sk_buff is initialized to network's header.
To find the udp header, instead of using udp_hdr() which assumes skb_network_header was set, manually calculate the udp header offset.
--- drivers/net/ethernet/mellanox/mlx5/core/en_selftest.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/net/ethernet/mellanox/mlx5/core/en_selftest.c +2 -1
@@ -216,7 +216,8 @@ mlx5e_test_loopback_validate(struct sk_bif (iph->protocol !=IPPROTO_UDP ) goto out; - udph =udp_hdr (skb); +/* Don't assume skb_transport_header() was set */ + udph = (struct udphdr *)((u8 *)iph +4 * iph->ihl);if (udph->dest !=htons (9 )) goto out;
Patches currently in stable-queue which might be from [email protected] are
queue-4.15/net-mlx5e-fix-loopback-self-test-when-gro-is-off.patch