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 A1FE54EE871 for ; Mon, 19 Oct 2026 12:03:49 +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=1792411431; cv=none; b=VLDNDxAVczu/FXtdEke2rr52sxvsIQHqEX46qENSe+KUyX9U6KI2jrz3+w7rxrBwUVMBVrp1iUCaJPKtiQWxTfswrDKLpTD5/Lx5Ii7imrMljPUgj3rpHdUYwyNjZlQ6dD4sl8Npudx4MT/rS/jkvQGPn/YTuIEmHJsCQlQXvXw= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1792411431; c=relaxed/simple; bh=IaWSRvOb2cGYlSz53/UzuVPRqHxy+V4mCLIjV89pieg=; h=Date:From:To:Cc:Subject:Message-ID:References:MIME-Version: Content-Type:Content-Disposition:In-Reply-To; b=p2+qI3mb/jpiclnz7pmD5P9a0KXsEwwN0kKuZR3WQdBjprkVyUJSObBq7H4Ho5tnydywcM+k8PX2Or6xnvtwoaDwFRVSF23AoG0x+w4cPVAqTIcnHUdiNXApdfFpqmi18Pof71OtX0womEpKr6q8C2kOR5MNg8WVDVhZuRpAv50= 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=NYi2GfEU; dkim=pass (2048-bit key) header.d=redhat.com header.i=@redhat.com header.b=MJgQ7MyK; 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="NYi2GfEU"; dkim=pass (2048-bit key) header.d=redhat.com header.i=@redhat.com header.b="MJgQ7MyK" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1792411428; 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: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=oaP8+sKI0/SWouY6crwA9muX1ZFQBStGGvXIun7lVgI=; b=NYi2GfEUfY24Zm5abVp6bAlGbbKfHXBKwC4FT66jc7B5VlglkGaE/RaLoJXYQS/48IubUH 0MlG9rokDTqhWC2oQ/42wo1f5pxZd8uUvscyZg8Ll0pilV/KKUv+X+PR38KHn6GaK84U5/ y4zv154CH/mPy8I95k3gldVLONoJOGI= Received: from mail-wm1-f72.google.com (mail-wm1-f72.google.com [209.85.128.72]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-215-tWx7zx41NpSwPMyZTm-Few-1; Mon, 19 Oct 2026 12:03:47 +0000 X-MC-Unique: tWx7zx41NpSwPMyZTm-Few-1 X-Mimecast-MFC-AGG-ID: tWx7zx41NpSwPMyZTm-Few_1792411426 Received: by mail-wm1-f72.google.com with SMTP id 5b1f17b1804b1-4a1d1f26a63so13277955e9.1 for ; Mon, 19 Oct 2026 05:03:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=google; t=1792411426; x=1793016226; darn=vger.kernel.org; h=in-reply-to:content-transfer-encoding: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=oaP8+sKI0/SWouY6crwA9muX1ZFQBStGGvXIun7lVgI=; b=MJgQ7MyK/09Rh4c36YDxarkVl6gMawS6YDGnXfp9D9ZO95EWDIlPl1WyCoyYfQ2EDF C+3GEQqEON4dkWKVneHaCg7SnAK1GVJMev44UOy8ExFGxTsxK2/toW+vEHXvmROpReTc /0+8yGQD+byb94AXgQ1ieGanFhlyoyYfrDNZeAPJ3XtRv1OHlgVCLm3zav2KKy6wDCtt rRwIlGxbsY3SHC1FqtAQ3X9Moq1V1V2417EzS4eGyyvlJCDTNDlqLw4lpnasr3HqpB9Y 1JnlgHjyw2fTmQVyFtkL4ZR/QpUXjc7GV5l5eyaqsLkiutMkD8rjPwKg9S1xmTXy6suU FTsg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1792411426; x=1793016226; h=in-reply-to:content-transfer-encoding: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=oaP8+sKI0/SWouY6crwA9muX1ZFQBStGGvXIun7lVgI=; b=wKkeij+IHLismRDMj70/njQ3ZWTxeNQD3AQ48UrZm7nXohkoFTXvKtGWDH2xjDtKlr qP6eWH+IaqxQZHUJj3RWD4z5znrvv7cOwcQO8wfZYidWALfD8gTKp9CQviA3tA8ETxHz nCq+8B5xoKaNFq6FINtt0/FDFoFU4VfTFRpVxoamGhJxsTQiHRmbdsRsCIj45zQMrV/6 1HNebvpUab6v+gFmd+gwmnHxFgJVAUTdI+eyS5xVM99jF/i5u8dQcHVZYExu+ANXZ53E O+DD2yZW6kPhr5xYpQ3HLaMPkZemEvidcZ+JagrEBdPA7eRuWM4hUZU4K/tljjH4PIQ5 GEvw== X-Gm-Message-State: AFq9FYJeI4o5q9Ul67N7n5dAmsWegCmTEjl1L+5XGwwlAr7ahVasp/3K 2dW/covp1SUW8A/9drddEM2tZMURinIrXR2rtnLRNzfx1DUOG4c5SnYjT+TUlKO59Q7PbQ9Z1i/ cLHPnDPRI2Ef1ErIALgjvAlgdR9TyXIScUQT0rhTpdLws51MpVYyFwZQp3DSFqaQ2d/EeX0yjIE F3lbstwsJR72gJwL6xUJ3cOL8UY46f7uGon7hB3eMJ800= X-Gm-Gg: AYBFou1a6V86wdHAb8musJdURPNjsBWBWyqcK0EwZc+u/CNdDoN6PYGIhweJMhxeBi3 wTLbcPoufrrSE6YTN09KAKt5Icg8ZyU4s+Ft7s6e0luX8qvslY53ap7zMeopOyWZzpcfmIOXa6E 5y+FuuB+XwPnBcuYu0TxRhCvlO+T565mPtS4GRFtGHZ7C4lGqSBoUhlzMiOilr8NomCFvN5ZnmD MIpRvmLSoJCU9DPVd7bQIacmtXRgXKcLLmL5r9uG/bQaWcnsCde4f2uWmlksoBxr2eZwXccOdDO izS1+HsfZ+SnDWojaH66CCDeTkKf4g/Vp7p7s3neWAl9xSNIF1TBp9w6g1B2/shwmuTiWQ== X-Received: by 2002:a05:600c:3b23:b0:4a1:cd83:b240 with SMTP id 5b1f17b1804b1-4a1d75ab20bmr196806865e9.1.1792411425947; Mon, 19 Oct 2026 05:03:45 -0700 (PDT) X-Received: by 2002:a05:600c:3b23:b0:4a1:cd83:b240 with SMTP id 5b1f17b1804b1-4a1d75ab20bmr196805755e9.1.1792411425263; Mon, 19 Oct 2026 05:03:45 -0700 (PDT) Received: from redhat.com ([2a0d:6fc0:3fd7:5300:3d6b:52a4:a23f:9d0b]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-48dfd4feb6bsm24518591f8f.41.2026.10.19.05.03.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 19 Oct 2026 05:03:44 -0700 (PDT) Date: Mon, 19 Oct 2026 08:03:42 -0400 From: "Michael S. Tsirkin" To: linux-kernel@vger.kernel.org Cc: Willem de Bruijn , Chris Arges , =?utf-8?B?QmrDtnJuIFTDtnBlbA==?= , Phil Sutter , 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, Max Krasnyansky , Rusty Russell Subject: [PATCH net v3 8/8] virtio_net: cleanup protocol calculation Message-ID: <13dd30912d6d03da7f432e115e9db1ea2d2cf37f.1792411304.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=utf-8 Content-Disposition: inline Content-Transfer-Encoding: 8bit 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 Reviewed-by: Björn Töpel --- 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 beaecd9cd28d..bb9b5d016ce8 100644 --- a/include/linux/virtio_net.h +++ b/include/linux/virtio_net.h @@ -603,8 +603,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; @@ -624,7 +624,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