svn commit: r297050 - stable/10/sys/dev/ixgbe

[Steven Hartland]

Author: smh
Date: Sat Mar 19 11:35:53 2016
New Revision: 297050
URL: https://svnweb.freebsd.org/changeset/base/297050

Log:
  MFC r296922:
  
  Prevent invalid ixgbe advertise setting warning
  
  Sponsored by:	Multiplay

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

Modified: stable/10/sys/dev/ixgbe/if_ix.c
==============================================================================
--- stable/10/sys/dev/ixgbe/if_ix.c	Sat Mar 19 09:20:18 2016	(r297049)
+++ stable/10/sys/dev/ixgbe/if_ix.c	Sat Mar 19 11:35:53 2016	(r297050)
@@ -4756,10 +4756,6 @@ ixgbe_sysctl_advertise(SYSCTL_HANDLER_AR
 	if ((error) || (req->newptr == NULL))
 		return (error);
 
-	/* Checks to validate new value */
-	if (adapter->advertise == advertise) /* no change */
-		return (0);
-
 	return ixgbe_set_advertise(adapter, advertise);
 }
 
@@ -4770,6 +4766,10 @@ ixgbe_set_advertise(struct adapter *adap
 	struct ixgbe_hw		*hw;
 	ixgbe_link_speed	speed;
 
+	/* Checks to validate new value */
+	if (adapter->advertise == advertise) /* no change */
+		return (0);
+
 	hw = &adapter->hw;
 	dev = adapter->dev;