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

[Sean Bruno]

Author: sbruno
Date: Fri Sep  4 15:34:27 2015
New Revision: 287461
URL: https://svnweb.freebsd.org/changeset/base/287461

Log:
  MFC r286238
  
  A misplaced #endif in ixgbe_ioctl() causes interface MTU to become
  zero when INET and INET6 are undefined.
  
  PR:		162028
  Submitted by:	hoomanfazaeli at gmail.com pluknet

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	Fri Sep  4 12:02:12 2015	(r287460)
+++ stable/10/sys/dev/ixgbe/if_ix.c	Fri Sep  4 15:34:27 2015	(r287461)
@@ -770,9 +770,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) {
 
@@ -785,7 +785,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.
@@ -794,11 +793,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)");