svn commit: r311081 - stable/10/sys/dev/sfxge/common

[Andrew Rybchenko]

Author: arybchik
Date: Mon Jan  2 09:34:05 2017
New Revision: 311081
URL: https://svnweb.freebsd.org/changeset/base/311081

Log:
  MFC r310748
  
  sfxge(4): cleanup: simplify disable scatter logic in ef10_rx_qcreate
  
  Submitted by:   Andy Moreton <amoreton at solarflare.com>
  Sponsored by:   Solarflare Communications, Inc.

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

Modified: stable/10/sys/dev/sfxge/common/ef10_rx.c
==============================================================================
--- stable/10/sys/dev/sfxge/common/ef10_rx.c	Mon Jan  2 09:32:45 2017	(r311080)
+++ stable/10/sys/dev/sfxge/common/ef10_rx.c	Mon Jan  2 09:34:05 2017	(r311081)
@@ -769,12 +769,10 @@ ef10_rx_qcreate(
 	}
 
 	/* Scatter can only be disabled if the firmware supports doing so */
-	if ((type != EFX_RXQ_TYPE_SCATTER) &&
-	    enp->en_nic_cfg.enc_rx_disable_scatter_supported) {
-		disable_scatter = B_TRUE;
-	} else {
+	if (type == EFX_RXQ_TYPE_SCATTER)
 		disable_scatter = B_FALSE;
-	}
+	else
+		disable_scatter = encp->enc_rx_disable_scatter_supported;
 
 	if ((rc = efx_mcdi_init_rxq(enp, n, eep->ee_index, label, index,
 	    esmp, disable_scatter)) != 0)