svn commit: r326788 - stable/11/sys/dev/vnic

Ed Maste emaste at FreeBSD.org
Tue Dec 12 01:20:47 UTC 2017


Author: emaste
Date: Tue Dec 12 01:20:45 2017
New Revision: 326788
URL: https://svnweb.freebsd.org/changeset/base/326788

Log:
  MFC r326597: vnic: apply hardware L3 checksum only for IPv4
  
  Previously we set the csum_l3 flag for IPv4 and IPv6, but only IPv4
  should have header checksumming applied.
  
  Prompted by Linux commit fa6d7cb5d76cf0467c61420fc9238045aedfd379.
  
  Sponsored by:	The FreeBSD Foundation

Modified:
  stable/11/sys/dev/vnic/nicvf_queues.c
Directory Properties:
  stable/11/   (props changed)

Modified: stable/11/sys/dev/vnic/nicvf_queues.c
==============================================================================
--- stable/11/sys/dev/vnic/nicvf_queues.c	Tue Dec 12 01:19:18 2017	(r326787)
+++ stable/11/sys/dev/vnic/nicvf_queues.c	Tue Dec 12 01:20:45 2017	(r326788)
@@ -1802,6 +1802,8 @@ nicvf_sq_add_hdr_subdesc(struct snd_queue *sq, int qen
 			if (mbuf == NULL)
 				return (ENOBUFS);
 		}
+		if (mbuf->m_pkthdr.csum_flags & CSUM_IP)
+			hdr->csum_l3 = 1; /* Enable IP csum calculation */
 
 		ip = (struct ip *)(mbuf->m_data + ehdrlen);
 		iphlen = ip->ip_hl << 2;
@@ -1809,13 +1811,10 @@ nicvf_sq_add_hdr_subdesc(struct snd_queue *sq, int qen
 		proto = ip->ip_p;
 		break;
 #endif
-	default:
-		hdr->csum_l3 = 0;
 	}
 
 #if defined(INET6) || defined(INET)
 	if (poff > 0 && mbuf->m_pkthdr.csum_flags != 0) {
-		hdr->csum_l3 = 1; /* Enable IP csum calculation */
 		switch (proto) {
 		case IPPROTO_TCP:
 			if ((mbuf->m_pkthdr.csum_flags & CSUM_TCP) == 0)


More information about the svn-src-all mailing list