diff options
| author | jfv <jfv@FreeBSD.org> | 2011-07-07 00:46:50 +0000 |
|---|---|---|
| committer | jfv <jfv@FreeBSD.org> | 2011-07-07 00:46:50 +0000 |
| commit | 20790a7ee39a20bebf638900b34bd41ba6a35bcd (patch) | |
| tree | 0844dc97715d0d04aa9803adab72ca9c5c45e8ed /sys/dev | |
| parent | 4a17b24427e55ec7e1862b08a0a9247f0717d010 (diff) | |
| download | FreeBSD-src-20790a7ee39a20bebf638900b34bd41ba6a35bcd.zip FreeBSD-src-20790a7ee39a20bebf638900b34bd41ba6a35bcd.tar.gz | |
A fix to make the LINT-NOINET build happy, if this
works out the ixgbe driver should be changed as well.
Diffstat (limited to 'sys/dev')
| -rw-r--r-- | sys/dev/e1000/if_igb.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sys/dev/e1000/if_igb.c b/sys/dev/e1000/if_igb.c index 972b745..ff2e424 100644 --- a/sys/dev/e1000/if_igb.c +++ b/sys/dev/e1000/if_igb.c @@ -1041,8 +1041,8 @@ igb_ioctl(struct ifnet *ifp, u_long command, caddr_t data) 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 command, caddr_t data) 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 command, caddr_t data) 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: |
