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 C6C6E205E26; Tue, 15 Oct 2024 12:54:55 +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=1728996895; cv=none; b=nA/iJAfzixujrrdJpzUptdID1Wxs2wQ6jOE1EmvR0TQ0Kx0iRhtA4ELaE8yH2XtlIyP4El5eW0cJYc0fGqD7Pp1diInAHvgstjg/gDxONXBNfsDLbqWHP6eXz9ShNGGRQ2oDaK00x9iLe+Zf96bMZpnpmzhxGt0cCJ5mPCrfUjk= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1728996895; c=relaxed/simple; bh=wcpzP6EmHbaaoS2Zd72LUpls/hae3GU3RRNyH5t7PXY=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=HjxrLow5z4gtp82sz2ShBvQbCbuJfhmWY1yjbBxmuKkgLbbE7ncX/heeiCMTd5e52EpFuJLzAbjDO3zW9IvTFROmBU/AQgrPgcy4Ys0/fP7855GOQ3GluI3fMFg7NXkLkwcenKEOzRmISLG39d8NTEmp18qL9GRZIy7qda9pPWs= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=zY5rFKur; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="zY5rFKur" Received: by smtp.kernel.org (Postfix) with ESMTPSA id C9E6DC4CEC6; Tue, 15 Oct 2024 12:54:54 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1728996895; bh=wcpzP6EmHbaaoS2Zd72LUpls/hae3GU3RRNyH5t7PXY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=zY5rFKurrAxkCI0KgQ4JmzcstW8aG0TuQQrfmtDAA+optIDiEExRORDkh8Ot6Bu3x vBPFQaBzdrqPKseZs2VrN/59KKq6jB1Aw84c6GQzLge39hczTNIsPU4qAhFff1uiBn YE+8CPCP3boMo+RH4eo1nkWCmdzbY9E84j9updys= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Moon Yeounsu , Christophe JAILLET , "David S. Miller" , Sasha Levin Subject: [PATCH 5.10 005/518] net: ethernet: use ip_hdrlen() instead of bit shift Date: Tue, 15 Oct 2024 14:38:29 +0200 Message-ID: <20241015123917.038605180@linuxfoundation.org> X-Mailer: git-send-email 2.47.0 In-Reply-To: <20241015123916.821186887@linuxfoundation.org> References: <20241015123916.821186887@linuxfoundation.org> User-Agent: quilt/0.67 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 5.10-stable review patch. If anyone has any objections, please let me know. ------------------ 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 e9efe074edc1..80858206c514 100644 --- a/drivers/net/ethernet/jme.c +++ b/drivers/net/ethernet/jme.c @@ -947,15 +947,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