Attachment 223401 Details for Bug 254366 – Proposed fix

Proposed fix

vtnet.patch (text/plain), 1.26 KB, created by Michael Tuexen on 2021-03-18 19:07:34 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Michael Tuexen

Created: 2021-03-18 19:07:34 UTC

Size: 1.26 KB

patch

obsolete

>diff --git a/sys/dev/virtio/network/if_vtnet.c b/sys/dev/virtio/network/if_vtnet.c
>index 09110183c30..3650d19fbe0 100644
>--- a/sys/dev/virtio/network/if_vtnet.c
>+++ b/sys/dev/virtio/network/if_vtnet.c
>@@ -2389,7 +2389,7 @@ vtnet_txq_offload_ctx(struct vtnet_txq *txq, struct mbuf *m, int *etype,
> }
> 
> static int
>-vtnet_txq_offload_tso(struct vtnet_txq *txq, struct mbuf *m, int flags,
>+vtnet_txq_offload_tso(struct vtnet_txq *txq, struct mbuf *m, int eth_type,
>     int offset, struct virtio_net_hdr *hdr)
> {
> 	static struct timeval lastecn;
>@@ -2407,8 +2407,8 @@ vtnet_txq_offload_tso(struct vtnet_txq *txq, struct mbuf *m, int flags,
> 
> 	hdr->hdr_len = vtnet_gtoh16(sc, offset + (tcp->th_off << 2));
> 	hdr->gso_size = vtnet_gtoh16(sc, m->m_pkthdr.tso_segsz);
>-	hdr->gso_type = (flags & CSUM_IP_TSO) ?
>-	    VIRTIO_NET_HDR_GSO_TCPV4 : VIRTIO_NET_HDR_GSO_TCPV6;
>+	hdr->gso_type = eth_type == ETHERTYPE_IP ? VIRTIO_NET_HDR_GSO_TCPV4 :
>+	    VIRTIO_NET_HDR_GSO_TCPV6;
> 
> 	if (__predict_false(tcp->th_flags & TH_CWR)) {
> 		/*
>@@ -2474,7 +2474,7 @@ vtnet_txq_offload(struct vtnet_txq *txq, struct mbuf *m,
> 			goto drop;
> 		}
> 
>-		error = vtnet_txq_offload_tso(txq, m, flags, csum_start, hdr);
>+		error = vtnet_txq_offload_tso(txq, m, etype, csum_start, hdr);
> 		if (error)
> 			goto drop;
> 	}

Actions: View

Attachments on bug 254366: 223365 | 223366 | 223367 | 223368 | 223369 | 223398 | 223399 | 223401