A fix to make the LINT-NOINET build happy, if this
works out the ixgbe driver should be changed as well.
This commit is contained in:
parent
afcc55f318
commit
980729b244
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=223831
@ -1041,8 +1041,8 @@ igb_ioctl(struct ifnet *ifp, u_long command, caddr_t data)
|
|||||||
struct ifreq *ifr = (struct ifreq *)data;
|
struct ifreq *ifr = (struct ifreq *)data;
|
||||||
#if defined(INET) || defined(INET6)
|
#if defined(INET) || defined(INET6)
|
||||||
struct ifaddr *ifa = (struct ifaddr *)data;
|
struct ifaddr *ifa = (struct ifaddr *)data;
|
||||||
bool avoid_reset = FALSE;
|
|
||||||
#endif
|
#endif
|
||||||
|
bool avoid_reset = FALSE;
|
||||||
int error = 0;
|
int error = 0;
|
||||||
|
|
||||||
if (adapter->in_detach)
|
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)
|
if (ifa->ifa_addr->sa_family == AF_INET6)
|
||||||
avoid_reset = TRUE;
|
avoid_reset = TRUE;
|
||||||
#endif
|
#endif
|
||||||
#if defined(INET) || defined(INET6)
|
|
||||||
/*
|
/*
|
||||||
** Calling init results in link renegotiation,
|
** Calling init results in link renegotiation,
|
||||||
** so we avoid doing it when possible.
|
** 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;
|
ifp->if_flags |= IFF_UP;
|
||||||
if (!(ifp->if_drv_flags & IFF_DRV_RUNNING))
|
if (!(ifp->if_drv_flags & IFF_DRV_RUNNING))
|
||||||
igb_init(adapter);
|
igb_init(adapter);
|
||||||
|
#ifdef INET
|
||||||
if (!(ifp->if_flags & IFF_NOARP))
|
if (!(ifp->if_flags & IFF_NOARP))
|
||||||
arp_ifinit(ifp, ifa);
|
arp_ifinit(ifp, ifa);
|
||||||
} else
|
|
||||||
#endif
|
#endif
|
||||||
|
} else
|
||||||
error = ether_ioctl(ifp, command, data);
|
error = ether_ioctl(ifp, command, data);
|
||||||
break;
|
break;
|
||||||
case SIOCSIFMTU:
|
case SIOCSIFMTU:
|
||||||
|
Loading…
Reference in New Issue
Block a user