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

[Andrew Rybchenko]

Author: arybchik
Date: Mon Jan  2 09:28:07 2017
New Revision: 311076
URL: https://svnweb.freebsd.org/changeset/base/311076

Log:
  MFC r310741
  
  sfxge(4): fix misuse of siena_build_filter in common code
  
  Submitted by:   Andy Moreton <amoreton at solarflare.com>
  Sponsored by:   Solarflare Communications, Inc.

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

Modified: stable/10/sys/dev/sfxge/common/efx_filter.c
==============================================================================
--- stable/10/sys/dev/sfxge/common/efx_filter.c	Mon Jan  2 09:27:28 2017	(r311075)
+++ stable/10/sys/dev/sfxge/common/efx_filter.c	Mon Jan  2 09:28:07 2017	(r311076)
@@ -1179,6 +1179,7 @@ siena_filter_restore(
 	efx_oword_t filter;
 	int filter_idx;
 	int state;
+	uint32_t key;
 	efx_rc_t rc;
 
 	EFSYS_LOCK(enp->en_eslp, state);
@@ -1192,8 +1193,10 @@ siena_filter_restore(
 				continue;
 
 			spec = &sftp->sft_spec[filter_idx];
-			if ((rc = siena_filter_build(&filter, spec)) != 0)
+			if ((key = siena_filter_build(&filter, spec)) == 0) {
+				rc = EINVAL;
 				goto fail1;
+			}
 			if ((rc = siena_filter_push_entry(enp,
 				    spec->sfs_type, filter_idx, &filter)) != 0)
 				goto fail2;