From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id CA85D207A37; Sat, 12 Oct 2024 11:30:18 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1728732618; cv=none; b=PY9CNIqMdPHXKcbkGMdhuNGxRPm6h6MjDNomYM2orrvdNHVrZgyzvTjDsKHwY0patJQS8pHtNqQqF1Pc1fVZs61H6e99Sa3hQOj7Juls5l17F7YIUACmgIGdwKNAT/DYTTo5h3sidix/rgSuPYI4wlowP4udl4JpCtDn7+gxqC0= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1728732618; c=relaxed/simple; bh=j8GEwSJ1gj4zKfxPjLXi3N7hglC5ZlDyEGbK3SNrinU=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=GFjMRykaIZoWNsfUeSFmPy0DYoilm5B0gbVijFDV9kM02pthJ9Y3HoAc5MDrMN3KyrJY9qhgk/75VuY6I8gwg1X7yDA8YvXEU1qddPUP8fJrx8B55H5CiQEt09zn/17CMtzkzy8sl8uaba9yEsCTrQhBmK0ZujldWKKVEGEF7Uc= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=EvlV+Vp/; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="EvlV+Vp/" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 284E6C4CEC6; Sat, 12 Oct 2024 11:30:17 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1728732618; bh=j8GEwSJ1gj4zKfxPjLXi3N7hglC5ZlDyEGbK3SNrinU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=EvlV+Vp/1dcovot7fIBdoG0SKdyZSXoG/JQFw1wUwD+Cs8yhSfDoubVeHLBADP0tK UURVn/DOoLl8tE4+47vD62HWjh+sYcklaUbc0tNT8Lb6k8GvuZD9mmQGk3x/iMNSx2 UQnTE4zm1reNV4AjA7b1KzC/wcTpCN9XjmlpH6GAHxyaMcAP0bGNmMLkBKjP9kkVd5 8kmidbxoxaUD9BrQlPRejzbVjOL3z9b6fz9/Fv6w9o212B5eVhXCg1qDb71zr7QL1w +9nzai9g9qsGJt0aXcjgtvpNQfQWVn+CkthHBBj5Ufx24s5mYxM8ZWpgzseN2kL5rt 8VbZaImstUuTw== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Moon Yeounsu , Christophe JAILLET , "David S . Miller" , Sasha Levin , cooldavid@cooldavid.org, edumazet@google.com, kuba@kernel.org, pabeni@redhat.com, sd@queasysnail.net, horms@kernel.org, jacob.e.keller@intel.com, netdev@vger.kernel.org Subject: [PATCH AUTOSEL 4.19 3/6] net: ethernet: use ip_hdrlen() instead of bit shift Date: Sat, 12 Oct 2024 07:30:00 -0400 Message-ID: <20241012113009.1764620-3-sashal@kernel.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20241012113009.1764620-1-sashal@kernel.org> References: <20241012113009.1764620-1-sashal@kernel.org> Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore X-stable-base: Linux 4.19.322 Content-Transfer-Encoding: 8bit From: Moon Yeounsu [ Upstream commit 9a039eeb71a42c8b13408a1976e300f3898e1be0 ] `ip_hdr(skb)->ihl << 2` is the same as `ip_hdrlen(skb)` Therefore, we should use a well-defined function not a bit shift to find the header length. It also compresses two lines to a single line. Signed-off-by: Moon Yeounsu Reviewed-by: Christophe JAILLET Signed-off-by: David S. Miller Signed-off-by: Sasha Levin --- drivers/net/ethernet/jme.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/drivers/net/ethernet/jme.c b/drivers/net/ethernet/jme.c index a5ab6f3403ae0..9b2471b2a9559 100644 --- a/drivers/net/ethernet/jme.c +++ b/drivers/net/ethernet/jme.c @@ -966,15 +966,13 @@ jme_udpsum(struct sk_buff *skb) if (skb->protocol != htons(ETH_P_IP)) return csum; skb_set_network_header(skb, ETH_HLEN); - if ((ip_hdr(skb)->protocol != IPPROTO_UDP) || - (skb->len < (ETH_HLEN + - (ip_hdr(skb)->ihl << 2) + - sizeof(struct udphdr)))) { + + if (ip_hdr(skb)->protocol != IPPROTO_UDP || + skb->len < (ETH_HLEN + ip_hdrlen(skb) + sizeof(struct udphdr))) { skb_reset_network_header(skb); return csum; } - skb_set_transport_header(skb, - ETH_HLEN + (ip_hdr(skb)->ihl << 2)); + skb_set_transport_header(skb, ETH_HLEN + ip_hdrlen(skb)); csum = udp_hdr(skb)->check; skb_reset_transport_header(skb); skb_reset_network_header(skb); -- 2.43.0