From owner-svn-src-head@freebsd.org  Mon Aug  3 16:39:26 2015
Return-Path: <owner-svn-src-head@freebsd.org>
Delivered-To: svn-src-head@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 D74109B2AA1;
 Mon,  3 Aug 2015 16:39:26 +0000 (UTC)
 (envelope-from sbruno@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2001:1900:2254:2068::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 C8A9BC1C;
 Mon,  3 Aug 2015 16:39:26 +0000 (UTC)
 (envelope-from sbruno@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.70])
 by repo.freebsd.org (8.14.9/8.14.9) with ESMTP id t73GdQ81096524;
 Mon, 3 Aug 2015 16:39:26 GMT (envelope-from sbruno@FreeBSD.org)
Received: (from sbruno@localhost)
 by repo.freebsd.org (8.14.9/8.14.9/Submit) id t73GdQrI096523;
 Mon, 3 Aug 2015 16:39:26 GMT (envelope-from sbruno@FreeBSD.org)
Message-Id: <201508031639.t73GdQrI096523@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: sbruno set sender to
 sbruno@FreeBSD.org using -f
From: Sean Bruno <sbruno@FreeBSD.org>
Date: Mon, 3 Aug 2015 16:39:26 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r286238 - head/sys/dev/ixgbe
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 03 Aug 2015 16:39:26 -0000

Author: sbruno
Date: Mon Aug  3 16:39:25 2015
New Revision: 286238
URL: https://svnweb.freebsd.org/changeset/base/286238

Log:
  A misplaced #endif in ixgbe_ioctl() causes interface MTU to become
  zero when INET and INET6 are undefined.
  
  PR:		162028
  Differential Revision:	https://reviews.freebsd.org/D3187
  Submitted by:	hoomanfazaeli@gmail.com pluknet
  Reviewed by:	erj hiren gelbius
  MFC after:	2 weeks

Modified:
  head/sys/dev/ixgbe/if_ix.c

Modified: head/sys/dev/ixgbe/if_ix.c
==============================================================================
--- head/sys/dev/ixgbe/if_ix.c	Mon Aug  3 16:35:18 2015	(r286237)
+++ head/sys/dev/ixgbe/if_ix.c	Mon Aug  3 16:39:25 2015	(r286238)
@@ -828,9 +828,9 @@ ixgbe_ioctl(struct ifnet * ifp, u_long c
 	struct ifreq	*ifr = (struct ifreq *) data;
 #if defined(INET) || defined(INET6)
 	struct ifaddr *ifa = (struct ifaddr *)data;
-	bool		avoid_reset = FALSE;
 #endif
 	int             error = 0;
+	bool		avoid_reset = FALSE;
 
 	switch (command) {
 
@@ -843,7 +843,6 @@ ixgbe_ioctl(struct ifnet * ifp, u_long c
 		if (ifa->ifa_addr->sa_family == AF_INET6)
 			avoid_reset = TRUE;
 #endif
-#if defined(INET) || defined(INET6)
 		/*
 		** Calling init results in link renegotiation,
 		** so we avoid doing it when possible.
@@ -852,11 +851,12 @@ ixgbe_ioctl(struct ifnet * ifp, u_long c
 			ifp->if_flags |= IFF_UP;
 			if (!(ifp->if_drv_flags & IFF_DRV_RUNNING))
 				ixgbe_init(adapter);
+#if defined(INET)
 			if (!(ifp->if_flags & IFF_NOARP))
 				arp_ifinit(ifp, ifa);
+#endif
 		} else
 			error = ether_ioctl(ifp, command, data);
-#endif
 		break;
 	case SIOCSIFMTU:
 		IOCTL_DEBUGOUT("ioctl: SIOCSIFMTU (Set Interface MTU)");