svn commit: r283217 - stable/10/sys/dev/sfxge

[Andrew Rybchenko]

Author: arybchik
Date: Thu May 21 09:24:35 2015
New Revision: 283217
URL: https://svnweb.freebsd.org/changeset/base/283217

Log:
  MFC: r283051
  
  sfxge: do not advertise LRO capability if LRO is compiled out
  
  Sponsored by:   Solarflare Communications, Inc.

Modified:
  stable/10/sys/dev/sfxge/sfxge.c
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/sys/dev/sfxge/sfxge.c
==============================================================================
--- stable/10/sys/dev/sfxge/sfxge.c	Thu May 21 09:23:28 2015	(r283216)
+++ stable/10/sys/dev/sfxge/sfxge.c	Thu May 21 09:24:35 2015	(r283217)
@@ -62,7 +62,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)
 #define	SFXGE_CAP_ENABLE SFXGE_CAP
 #define	SFXGE_CAP_FIXED (IFCAP_VLAN_MTU |				\
@@ -88,7 +88,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);
 
@@ -376,6 +375,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;