d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Last change still had an issue, one more time...

Browse Source
This commit is contained in:
Jack F Vogel 2011-12-11 18:46:14 +00:00
parent 9932a3fefc
commit 62aca36544
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=228415
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
sys/dev/e1000/if_em.c
View File

@ -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:
{

6
sys/dev/e1000/if_igb.c
View File

@ -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:
{