Date: Sat, 17 Dec 2011 15:27:51 +0000 From: "Bjoern A. Zeeb" <bzeeb-lists@lists.zabbadoz.net> To: Luigi Rizzo <rizzo@iet.unipi.it> Cc: Jack F Vogel <jfv@FreeBSD.org>, 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: <2C809F6E-4D03-4744-966B-E67E991A18C7@lists.zabbadoz.net> In-Reply-To: <20111212130849.GA24560@onelab2.iet.unipi.it> References: <201112111846.pBBIkE65064248@svn.freebsd.org> <20111212130849.GA24560@onelab2.iet.unipi.it>
next in thread | previous in thread | raw e-mail | index | archive | help
On 12. Dec 2011, at 13:08 , Luigi Rizzo wrote: > 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 >>=20 >> Log: >> Last change still had an issue, one more time... >=20 > 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 ? >=20 I am not sure why yet (and it could be someone broke the "clean" parts = of the build system) but I am seeing this and cannot remember reports = the last days: In file included from = /scratch/tmp/bz/head.universe/sys/modules/em/../../dev/e1000/if_em.c:400: @/dev/netmap/if_em_netmap.h: In function 'em_netmap_rxsync': @/dev/netmap/if_em_netmap.h:332: warning: dereferencing 'void *' pointer @/dev/netmap/if_em_netmap.h:332: error: request for member 'dt_mt' in = something not a structure or union for a LINT build on sparc64. > cheers > luigi >=20 >> Modified: >> head/sys/dev/e1000/if_em.c >> head/sys/dev/e1000/if_igb.c >>=20 >> Modified: head/sys/dev/e1000/if_em.c >> = =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D >> --- 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 =3D (struct ifreq *)data; >> #if defined(INET) || defined(INET6) >> struct ifaddr *ifa =3D (struct ifaddr *)data; >> - bool avoid_reset =3D FALSE; >> #endif >> + bool avoid_reset =3D FALSE; >> int error =3D 0; >>=20 >> if (adapter->in_detach) >> @@ -1062,7 +1062,6 @@ em_ioctl(struct ifnet *ifp, u_long comma >> if (ifa->ifa_addr->sa_family =3D=3D AF_INET6) >> avoid_reset =3D 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 |=3D 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 =3D ether_ioctl(ifp, command, data); >> -#endif >> break; >> case SIOCSIFMTU: >> { >>=20 >> Modified: head/sys/dev/e1000/if_igb.c >> = =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D >> --- 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 =3D (struct ifreq *)data; >> #if defined(INET) || defined(INET6) >> struct ifaddr *ifa =3D (struct ifaddr *)data; >> - bool avoid_reset =3D FALSE; >> #endif >> + bool avoid_reset =3D FALSE; >> int error =3D 0; >>=20 >> if (adapter->in_detach) >> @@ -1009,7 +1009,6 @@ igb_ioctl(struct ifnet *ifp, u_long comm >> if (ifa->ifa_addr->sa_family =3D=3D AF_INET6) >> avoid_reset =3D 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 |=3D 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 =3D ether_ioctl(ifp, command, data); >> -#endif >> break; >> case SIOCSIFMTU: >> { --=20 Bjoern A. Zeeb You have to have visions! Stop bit received. Insert coin for new address family.
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?2C809F6E-4D03-4744-966B-E67E991A18C7>