Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 18 May 2015 06:07:03 +0000 (UTC)
From:      Andrew Rybchenko <arybchik@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org
Subject:   svn commit: r283051 - head/sys/dev/sfxge
Message-ID:  <201505180607.t4I673gc082091@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: arybchik
Date: Mon May 18 06:07:02 2015
New Revision: 283051
URL: https://svnweb.freebsd.org/changeset/base/283051

Log:
  sfxge: do not advertise LRO capability if LRO is compiled out
  
  Reviewed by:    gnn
  Sponsored by:   Solarflare Communications, Inc.
  MFC after:      2 days
  Differential Revision: https://reviews.freebsd.org/D2565

Modified:
  head/sys/dev/sfxge/sfxge.c

Modified: head/sys/dev/sfxge/sfxge.c
==============================================================================
--- head/sys/dev/sfxge/sfxge.c	Mon May 18 06:04:20 2015	(r283050)
+++ head/sys/dev/sfxge/sfxge.c	Mon May 18 06:07:02 2015	(r283051)
@@ -63,7 +63,7 @@ __FBSDID("$FreeBSD$");
 		   IFCAP_RXCSUM | IFCAP_TXCSUM |			\
 		   IFCAP_RXCSUM_IPV6 | IFCAP_TXCSUM_IPV6 |		\
 		   IFCAP_TSO4 | IFCAP_TSO6 |				\
-		   IFCAP_JUMBO_MTU | IFCAP_LRO |			\
+		   IFCAP_JUMBO_MTU |					\
 		   IFCAP_VLAN_HWTSO | IFCAP_LINKSTATE | IFCAP_HWSTATS)
 #define	SFXGE_CAP_ENABLE SFXGE_CAP
 #define	SFXGE_CAP_FIXED (IFCAP_VLAN_MTU |				\
@@ -89,7 +89,6 @@ SYSCTL_INT(_hw_sfxge, OID_AUTO, tx_ring,
 	   &sfxge_tx_ring_entries, 0,
 	   "Maximum number of descriptors in a transmit ring");
 
-
 static void
 sfxge_reset(void *arg, int npending);
 
@@ -377,6 +376,12 @@ sfxge_ifnet_init(struct ifnet *ifp, stru
 
 	ifp->if_capabilities = SFXGE_CAP;
 	ifp->if_capenable = SFXGE_CAP_ENABLE;
+
+#ifdef SFXGE_LRO
+	ifp->if_capabilities |= IFCAP_LRO;
+	ifp->if_capenable |= IFCAP_LRO;
+#endif
+
 	ifp->if_hwassist = CSUM_TCP | CSUM_UDP | CSUM_IP | CSUM_TSO |
 			   CSUM_TCP_IPV6 | CSUM_UDP_IPV6;
 



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