svn commit: r310748 - head/sys/dev/sfxge/common

[Andrew Rybchenko]

Author: arybchik
Date: Thu Dec 29 06:56:18 2016
New Revision: 310748
URL: https://svnweb.freebsd.org/changeset/base/310748

Log:
  sfxge(4): cleanup: simplify disable scatter logic in ef10_rx_qcreate
  
  Reviewed by:    gnn
  Submitted by:   Andy Moreton <amoreton at solarflare.com>
  Sponsored by:   Solarflare Communications, Inc.
  MFC after:      2 days
  Differential Revision:  https://reviews.freebsd.org/D8945

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

Modified: head/sys/dev/sfxge/common/ef10_rx.c
==============================================================================
--- head/sys/dev/sfxge/common/ef10_rx.c	Thu Dec 29 06:54:40 2016	(r310747)
+++ head/sys/dev/sfxge/common/ef10_rx.c	Thu Dec 29 06:56:18 2016	(r310748)
@@ -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)