[PATCH net v5 7/7] virtio_net: cleanup protocol calculation
flat view
COOLING7d
REVIEWED: 1 (1M)
From: Michael S. Tsirkin <mst@redhat.com>
Date: 2026-10-22 12:58:51
Also in:
lkml, virtualization
Subsystem:
the rest, virtio core, virtio net driver · Maintainers:
Linus Torvalds, "Michael S. Tsirkin", Jason Wang, Eugenio Pérez
Status: Reviewed.
Revision v5 (4 revisions archived); 1 review trailer.
Revisions (4)
A trivial cleanup removing a duplicated code line. Signed-off-by: Michael S. Tsirkin <mst@redhat.com> Reviewed-by: Björn Töpel <bjorn@kernel.org> --- 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 063cc116e51a..e984e446ba44 100644
--- a/include/linux/virtio_net.h
+++ b/include/linux/virtio_net.h@@ -613,8 +613,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;
@@ -638,7 +638,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