From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) (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 212CD52BE5C for ; Thu, 15 Oct 2026 12:41:58 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=170.10.129.124 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1792068119; cv=none; b=gUtCi1ZuskJE30Jb+cEryojBcualRv9t9PFl0H5zkmAza/lSOsOaC6J2gLmhaBoFEelkC10gzlx45PiOJTXcjv5+VOTFqKGzS27YddE06BQnzKFdYCob0Mr96bvtPxIeyiNbmxGBkvBVFFlVchI+vmqyWFla3NCM5TSU4E4OWpU= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1792068119; c=relaxed/simple; bh=FTwjQZjllXzgo977Sf3MiFovVAncHOGHuO9YtIzBc3o=; h=Date:From:To:Cc:Subject:Message-ID:References:MIME-Version: Content-Type:Content-Disposition:In-Reply-To; b=it2q+D1wQSYz7ToaULJOY2MW+u1O89rcE3g1qCDDGWS8cEAZf5ZQk5dySgQgjbl0CULe9HYmsXYYtPUdMC5d3H0W3C8yEIW9++ROY46FqVHUcrEnsqHxQ7iAEETDCzW9C/0gsI1/TvkQp8tNxovtIUDDnrL4b+s9g7+dwvSkCII= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=redhat.com; spf=pass smtp.mailfrom=redhat.com; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b=YgB3sP9d; dkim=pass (2048-bit key) header.d=redhat.com header.i=@redhat.com header.b=TMme7vQZ; arc=none smtp.client-ip=170.10.129.124 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=redhat.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=redhat.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="YgB3sP9d"; dkim=pass (2048-bit key) header.d=redhat.com header.i=@redhat.com header.b="TMme7vQZ" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1792068117; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=B0zC8OJ6Wap1IWbd88wEN7TwTQBf0XfiTXbdedWRtNk=; b=YgB3sP9dEnUjGibH7skj/5Nrq3w9xjr8EA+aTPnRNTnXsxztpLAG/+/pYytNNqXC0EQk7E Mp4sYEUnD5BGsanZOK+crAPFHa7kzohnlokPPZiv6x14Rf6bJllqHyVNDS4HwYKVMFPhN1 cjVasQ2X4EamSOAVz2QLkkf1asGLCdg= Received: from mail-wr1-f70.google.com (mail-wr1-f70.google.com [209.85.221.70]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-675-KrxbiBpTODWpfAQp42q23g-1; Thu, 15 Oct 2026 12:41:56 +0000 X-MC-Unique: KrxbiBpTODWpfAQp42q23g-1 X-Mimecast-MFC-AGG-ID: KrxbiBpTODWpfAQp42q23g_1792068115 Received: by mail-wr1-f70.google.com with SMTP id ffacd0b85a97d-48b02d63407so3174880f8f.0 for ; Thu, 15 Oct 2026 05:41:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=google; t=1792068115; x=1792672915; darn=vger.kernel.org; h=in-reply-to:content-disposition:content-type:mime-version :references:message-id:subject:cc:to:from:date:from:to:cc:subject :date:message-id:reply-to:content-type; bh=B0zC8OJ6Wap1IWbd88wEN7TwTQBf0XfiTXbdedWRtNk=; b=TMme7vQZznECjHpnYeNObJDV8BytbFD17NyXNqDtuYlEhdWKvSM6aIAUdEhCxyQJv/ k5mf3oIlsAEp0++idEVt7/oY07bl9adK8LV61ccCEOLKj4h6aL8PFXXq46TCCStw4LUo 5UVVtweFnl4Xn7Cvw8izJ742X+HolEqAArHdZBAP4xBXNAcXCqcS/xqIzTyPTjgOoKXt 5REOu0f01Kz6vSkvLgBZCoLCr4U/3/jhAGc11S8cYis2C5qm2mzlkdKuQ27r4CD8J958 Tbinpw7Mdw9noAsS7G75k1sf/XbCic9fUaKLsbLk0U5ORXq46avUcAT5/YSC2VpzdD5k W6XA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1792068115; x=1792672915; h=in-reply-to:content-disposition:content-type:mime-version :references:message-id:subject:cc:to:from:date:x-gm-gg :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to :content-type; bh=B0zC8OJ6Wap1IWbd88wEN7TwTQBf0XfiTXbdedWRtNk=; b=EooQq+3p2l+gaWILHgcwOYPoMxlWIOnvNQJ+qe5IkB7dOZv9/RLXvyu4D8y305U2yv IDW+hHleR8qDsnWmbBhbhRcYP7neWrugyoZn/aZb7dVhltAVlhTqXgMSqCtNkXNsYSPr 2QlphFA81IaO6zThYFGT6sp0n9FH3GGCmtm5FYWbOkjYKrsEN6aFn66t9ZNRtXP1OEwf /NaAP7ionVcjPt8LdMhLYsrzjuS4+sat5EltYR2tQt6gbJeyWb9Y2K/ynpP5JW2qqWr/ 9BJsWO+O9OrqBH/GNYPpKZxGi/cqeeQG1MR0JNUwCl9WC2Sdf+8+cXzj4wNylwmcYDHD RYjQ== X-Gm-Message-State: AFq9FYJQtr5QXv8fmr6z7HhGB/m9VRiItkgi6yCOqhnMncXxPnc9+UJM LPrYvQlQ8otP0WJN9d8DjuPb4VcESeq2tlhh2FbkxyESb6kCh2REKcz5bEmsVjWp34tF+ZyiAko SBaykaT3YvXddsVbc6Mcydz7xyTvWE/MPbV8vrFSZ12g71NyQSI5rlcgaTcmUNPA7TjxNw4rXX2 EvhjSB0I2tkCAJUK41oHKlFF7OFAWQS1J7vkjPavVBUpc= X-Gm-Gg: AYBFou2fCuk8U75PlDzkjCrThRYNKwA/krUdFW8atd40tPbwEHrQBB9zDSqqrtixN7d KcWh2RmLSfDMsijzIjZ1LpKEblOyDU4rlsdCU0QJ/dwntE8YAkIelm+dCWNCZnRFjkvPB1C+5Da pLUsPokCVcZhGbp2e5UsT2uB2QoUBbwHaDC4Z79kFFu3LCeQ/e7eU4/mLejRFribjLtyoHb//gr ula/kyzNSNP8Jhbet/m/ToLLMWfzUd7xecLQpTkMmeiiXfO7UQST5o6kx2C9H4AEddg87hrvIam AlZuXwqAfERKDPczncHo5kLw8lo9+uHJjY7MK4eMReE9/q/ChzWsx+229Jn2pQY3/uXt8A== X-Received: by 2002:a05:6000:25f1:b0:48d:f02c:eb68 with SMTP id ffacd0b85a97d-48df02cec55mr8110185f8f.10.1792068114692; Thu, 15 Oct 2026 05:41:54 -0700 (PDT) X-Received: by 2002:a05:6000:25f1:b0:48d:f02c:eb68 with SMTP id ffacd0b85a97d-48df02cec55mr8110120f8f.10.1792068114075; Thu, 15 Oct 2026 05:41:54 -0700 (PDT) Received: from redhat.com ([2a0d:6fc0:3fd7:5300:3d6b:52a4:a23f:9d0b]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-48de0ab5b03sm19748114f8f.30.2026.10.15.05.41.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 15 Oct 2026 05:41:53 -0700 (PDT) Date: Thu, 15 Oct 2026 08:41:51 -0400 From: "Michael S. Tsirkin" To: linux-kernel@vger.kernel.org Cc: Willem de Bruijn , Jason Wang , Eugenio =?utf-8?B?UMOpcmV6?= , Xuan Zhuo , Andrew Lunn , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , netdev@vger.kernel.org, virtualization@lists.linux.dev, Rusty Russell , Max Krasnyansky Subject: [PATCH net-next v2 7/7] virtio_net: cleanup protocol calculation Message-ID: <3c828204754ba2218e419f8d0a20bede7d8dffe1.1792067836.git.mst@redhat.com> References: Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: X-Mailer: git-send-email 2.51.2.2891.g4157995a80.dirty X-Mutt-Fcc: =sent A trivial cleanup removing a duplicated code line. Signed-off-by: Michael S. Tsirkin --- include/linux/virtio_net.h | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/include/linux/virtio_net.h b/include/linux/virtio_net.h index 85ec1039f73a..a9ed42013476 100644 --- a/include/linux/virtio_net.h +++ b/include/linux/virtio_net.h @@ -570,8 +570,8 @@ virtio_net_hdr_tnl_to_skb(struct sk_buff *skb, return -EINVAL; } - skb_set_inner_protocol(skb, inner_isv6 ? htons(ETH_P_IPV6) : - htons(ETH_P_IP)); + inner_proto = inner_isv6 ? htons(ETH_P_IPV6) : htons(ETH_P_IP); + skb_set_inner_protocol(skb, inner_proto); if (hdr->flags & VIRTIO_NET_HDR_F_UDP_TUNNEL_CSUM) { if (!tnl_csum_negotiated) return -EINVAL; @@ -591,7 +591,6 @@ virtio_net_hdr_tnl_to_skb(struct sk_buff *skb, * We know VIRTIO_NET_HDR_F_NEEDS_CSUM was set so __virtio_net_hdr_to_skb * set CHECKSUM_PARTIAL. */ - inner_proto = inner_isv6 ? htons(ETH_P_IPV6) : htons(ETH_P_IP); if (virtio_net_csum_partial_ok_at_offset(skb, gso_inner_type, inner_nh, inner_proto)) return 0; -- MST