From owner-svn-src-stable@freebsd.org  Sat Mar 19 11:35:55 2016
Return-Path: <owner-svn-src-stable@freebsd.org>
Delivered-To: svn-src-stable@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 1A81FAD5E9F;
 Sat, 19 Mar 2016 11:35:55 +0000 (UTC) (envelope-from smh@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id D82CF1E72;
 Sat, 19 Mar 2016 11:35:54 +0000 (UTC) (envelope-from smh@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u2JBZsIo050848;
 Sat, 19 Mar 2016 11:35:54 GMT (envelope-from smh@FreeBSD.org)
Received: (from smh@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u2JBZrY1050847;
 Sat, 19 Mar 2016 11:35:53 GMT (envelope-from smh@FreeBSD.org)
Message-Id: <201603191135.u2JBZrY1050847@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: smh set sender to smh@FreeBSD.org
 using -f
From: Steven Hartland <smh@FreeBSD.org>
Date: Sat, 19 Mar 2016 11:35:53 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org
Subject: svn commit: r297050 - stable/10/sys/dev/ixgbe
X-SVN-Group: stable-10
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-stable@freebsd.org
X-Mailman-Version: 2.1.21
Precedence: list
List-Id: SVN commit messages for all the -stable branches of the src tree
 <svn-src-stable.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-stable>, 
 <mailto:svn-src-stable-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable/>
List-Post: <mailto:svn-src-stable@freebsd.org>
List-Help: <mailto:svn-src-stable-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-stable>,
 <mailto:svn-src-stable-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 19 Mar 2016 11:35:55 -0000

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;