Date: Mon, 12 Dec 2011 14:08:49 +0100 From: Luigi Rizzo <rizzo@iet.unipi.it> To: Jack F Vogel <jfv@FreeBSD.org> Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org, src-committers@freebsd.org Subject: Re: svn commit: r228415 - head/sys/dev/e1000 Message-ID: <20111212130849.GA24560@onelab2.iet.unipi.it> In-Reply-To: <201112111846.pBBIkE65064248@svn.freebsd.org> References: <201112111846.pBBIkE65064248@svn.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
On Sun, Dec 11, 2011 at 06:46:14PM +0000, Jack F Vogel wrote: > Author: jfv > Date: Sun Dec 11 18:46:14 2011 > New Revision: 228415 > URL: http://svn.freebsd.org/changeset/base/228415 > > Log: > Last change still had an issue, one more time... Jack, the previous commit (rev. 228387) removed netmap support from if_igb.c I believe it was unintentional. Can you put it back, or do you want me to handle it ? cheers luigi > Modified: > head/sys/dev/e1000/if_em.c > head/sys/dev/e1000/if_igb.c > > Modified: head/sys/dev/e1000/if_em.c > ============================================================================== > --- head/sys/dev/e1000/if_em.c Sun Dec 11 17:32:37 2011 (r228414) > +++ head/sys/dev/e1000/if_em.c Sun Dec 11 18:46:14 2011 (r228415) > @@ -1045,8 +1045,8 @@ em_ioctl(struct ifnet *ifp, u_long comma > 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 comma > 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 comma > 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: > { > > Modified: head/sys/dev/e1000/if_igb.c > ============================================================================== > --- head/sys/dev/e1000/if_igb.c Sun Dec 11 17:32:37 2011 (r228414) > +++ head/sys/dev/e1000/if_igb.c Sun Dec 11 18:46:14 2011 (r228415) > @@ -992,8 +992,8 @@ igb_ioctl(struct ifnet *ifp, u_long comm > 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 comm > 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 comm > 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: > {
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20111212130849.GA24560>