Author: jfv
Date: Thu Jul 7 00:46:50 2011
New Revision: 223831
URL: http://svn.freebsd.org/changeset/base/223831
Log:
A fix to make the LINT-NOINET build happy, if this
works out the ixgbe driver should be changed as well.
Modified:
head/sys/dev/e1000/if_igb.c
Modified: head/sys/dev/e1000/if_igb.c
==============================================================================
--- head/sys/dev/e1000/if_igb.c Thu Jul 7 00:30:34 2011 (r223830)
+++ head/sys/dev/e1000/if_igb.c Thu Jul 7 00:46:50 2011 (r223831)
@@ -1041,8 +1041,8 @@ igb_ioctl(struct ifnet *ifp, u_long comm
struct ifreq *ifr = (struct ifreq *)data;
#if defined(INET) || defined(INET6)
struct ifaddr *ifa = (struct ifaddr *)data;
- bool avoid_reset = FALSE;
#endif
+ bool avoid_reset = FALSE;
int error = 0;
if (adapter->in_detach)
@@ -1058,7 +1058,6 @@ igb_ioctl(struct ifnet *ifp, u_long comm
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.
@@ -1067,10 +1066,11 @@ igb_ioctl(struct ifnet *ifp, u_long comm
ifp->if_flags |= IFF_UP;
if (!(ifp->if_drv_flags & IFF_DRV_RUNNING))
igb_init(adapter);
+#ifdef INET
if (!(ifp->if_flags & IFF_NOARP))
arp_ifinit(ifp, ifa);
- } else
#endif
+ } else
error = ether_ioctl(ifp, command, data);
break;
case SIOCSIFMTU:
_______________________________________________
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
