diff options
| author | jfv <jfv@FreeBSD.org> | 2011-12-11 18:46:14 +0000 |
|---|---|---|
| committer | jfv <jfv@FreeBSD.org> | 2011-12-11 18:46:14 +0000 |
| commit | 24af94438a9d7570f0b95d8c73b4e1e52d480799 (patch) | |
| tree | 36fa4cdbdc5ba80ac99996398b906b94a2db0697 /sys/dev | |
| parent | f297a69ec56ed61c75c4da4af31a82bb652a7e67 (diff) | |
| download | FreeBSD-src-24af94438a9d7570f0b95d8c73b4e1e52d480799.zip FreeBSD-src-24af94438a9d7570f0b95d8c73b4e1e52d480799.tar.gz | |
Last change still had an issue, one more time...
Diffstat (limited to 'sys/dev')
| -rw-r--r-- | sys/dev/e1000/if_em.c | 6 | ||||
| -rw-r--r-- | sys/dev/e1000/if_igb.c | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/sys/dev/e1000/if_em.c b/sys/dev/e1000/if_em.c index 122c280..3d21da3 100644 --- a/sys/dev/e1000/if_em.c +++ b/sys/dev/e1000/if_em.c @@ -1045,8 +1045,8 @@ em_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) @@ -1062,7 +1062,6 @@ em_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. @@ -1071,11 +1070,12 @@ em_ioctl(struct ifnet *ifp, u_long command, caddr_t data) ifp->if_flags |= IFF_UP; if (!(ifp->if_drv_flags & IFF_DRV_RUNNING)) em_init(adapter); +#ifdef INET if (!(ifp->if_flags & IFF_NOARP)) arp_ifinit(ifp, ifa); +#endif } else error = ether_ioctl(ifp, command, data); -#endif break; case SIOCSIFMTU: { diff --git a/sys/dev/e1000/if_igb.c b/sys/dev/e1000/if_igb.c index 2156b72..dc643c7 100644 --- a/sys/dev/e1000/if_igb.c +++ b/sys/dev/e1000/if_igb.c @@ -992,8 +992,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) @@ -1009,7 +1009,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. @@ -1018,11 +1017,12 @@ 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); +#endif } else error = ether_ioctl(ifp, command, data); -#endif break; case SIOCSIFMTU: { |
