Skip site navigation (1)Skip section navigation (2) 
Date:      Sun, 15 Jul 2018 18:02:50 +0000 (UTC)
From:      Marius Strobl <marius@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org
Subject:   svn commit: r336309 - head/sys/dev/ixl
Message-ID:  <201807151802.w6FI2oUt009647@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help 
Author: marius
Date: Sun Jul 15 18:02:50 2018
New Revision: 336309
URL: https://svnweb.freebsd.org/changeset/base/336309

Log:
  As suggested by a comment in ixl_initialize_vsi(), use if_getcapenable(9)
  instead of directly interrogating ifp->if_capenable.
  
  Reviewed by:	erj (ixl_initialize_vsi())
  Differential Revision:	https://reviews.freebsd.org/D15720 (part of)

Modified:
  head/sys/dev/ixl/ixl_pf_main.c
  head/sys/dev/ixl/ixl_txrx.c

Modified: head/sys/dev/ixl/ixl_pf_main.c
==============================================================================
--- head/sys/dev/ixl/ixl_pf_main.c	Sun Jul 15 17:31:50 2018	(r336308)
+++ head/sys/dev/ixl/ixl_pf_main.c	Sun Jul 15 18:02:50 2018	(r336309)
@@ -1219,8 +1219,7 @@ ixl_initialize_vsi(struct ixl_vsi *vsi)
 	/* Set VLAN receive stripping mode */
 	ctxt.info.valid_sections |= I40E_AQ_VSI_PROP_VLAN_VALID;
 	ctxt.info.port_vlan_flags = I40E_AQ_VSI_PVLAN_MODE_ALL;
-	// TODO: Call function to get this cap bit, instead
-	if (vsi->ifp->if_capenable & IFCAP_VLAN_HWTAGGING)
+	if (if_getcapenable(vsi->ifp) & IFCAP_VLAN_HWTAGGING)
 		ctxt.info.port_vlan_flags |= I40E_AQ_VSI_PVLAN_EMOD_STR_BOTH;
 	else
 		ctxt.info.port_vlan_flags |= I40E_AQ_VSI_PVLAN_EMOD_NOTHING;

Modified: head/sys/dev/ixl/ixl_txrx.c
==============================================================================
--- head/sys/dev/ixl/ixl_txrx.c	Sun Jul 15 17:31:50 2018	(r336308)
+++ head/sys/dev/ixl/ixl_txrx.c	Sun Jul 15 18:02:50 2018	(r336309)
@@ -687,7 +687,7 @@ ixl_isc_rxd_pkt_get(void *arg, if_rxd_info_t ri)
 	rxr->packets++;
 	rxr->rx_packets++;
 
-	if ((vsi->ifp->if_capenable & IFCAP_RXCSUM) != 0)
+	if ((if_getcapenable(vsi->ifp) & IFCAP_RXCSUM) != 0)
 		ixl_rx_checksum(ri, status, error, ptype);
 	ri->iri_flowid = le32toh(cur->wb.qword0.hi_dword.rss);
 	ri->iri_rsstype = ixl_ptype_to_hash(ptype);

Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201807151802.w6FI2oUt009647>