D3187.id7265.diff
No OneTemporary
Actions

Size

1018 B

Referenced Files

None

Subscribers

None

D3187.id7265.diff
View Options

	Index: sys/dev/ixgbe/if_ix.c
	===================================================================
	--- sys/dev/ixgbe/if_ix.c
	+++ sys/dev/ixgbe/if_ix.c
	@@ -828,9 +828,9 @@
	struct ifreq ifr = (struct ifreq ) data;
	#if defined(INET) \|\| defined(INET6)
	struct ifaddr ifa = (struct ifaddr )data;
	- bool avoid_reset = FALSE;
	#endif
	int error = 0;
	+ bool avoid_reset = FALSE;

	switch (command) {

	@@ -843,7 +843,6 @@
	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.
	@@ -852,11 +851,12 @@
	ifp->if_flags \|= IFF_UP;
	if (!(ifp->if_drv_flags & IFF_DRV_RUNNING))
	ixgbe_init(adapter);
	+#if defined(INET)
	if (!(ifp->if_flags & IFF_NOARP))
	arp_ifinit(ifp, ifa);
	+#endif
	} else
	error = ether_ioctl(ifp, command, data);
	-#endif
	break;
	case SIOCSIFMTU:
	IOCTL_DEBUGOUT("ioctl: SIOCSIFMTU (Set Interface MTU)");