cvs commit: src/sys/dev/em if_em.c

[Jack Vogel]

On 10/6/07, Mike Tancsa <mike at sentex.net> wrote:
> At 03:36 PM 10/6/2007, Jack F Vogel wrote:
> >jfv         2007-10-06 19:36:35 UTC
> >
> >   FreeBSD src repository
> >
> >   Modified files:        (Branch: RELENG_6)
> >     sys/dev/em           if_em.c
> >   Log:
> >   Couple corrections on the MFC, first POLLING had a 7.0
> >   interface left in, thanks to those that caught this.
>
> Hi,
>          Not sure if I am missing anything, but a recent cvsup has
> buildkernel failing on
>
> -ffreestanding -Werror  /usr/src/sys/dev/cpufreq/ichss.c
> awk -f /usr/src/sys/tools/makeobjops.awk
> /usr/src/sys/dev/eisa/eisa_if.m -c ;  cc -c -O -pipe  -Wall
> -Wredundant-decls -Wnested-externs
> -Wstrict-prototypes  -Wmissing-prototypes -Wpointer-arith -Winline
> -Wcast-qual  -fformat-extensions -std=c99 -g -nostdinc -I-  -I.
> -I/usr/src/sys -I/usr/src/sys/contrib/altq
> -I/usr/src/sys/contrib/ipfilter -I/usr/src/sys/contrib/pf
> -I/usr/src/sys/dev/ath -I/usr/src/sys/contrib/ngatm
> -I/usr/src/sys/dev/twa -I/usr/src/sys/dev/em -I/usr/src/sys/dev/em
> -D_KERNEL -DHAVE_KERNEL_OPTION_HEADERS -include opt_global.h
> -fno-common -finline-limit=8000 --param inline-unit-growth=100
> --param large-function-growth=1000  -mno-align-long-strings
> -mpreferred-stack-boundary=2  -mno-mmx -mno-3dnow -mno-sse -mno-sse2
> -ffreestanding -Werror  eisa_if.c
> cc -c -O -pipe  -Wall -Wredundant-decls -Wnested-externs
> -Wstrict-prototypes  -Wmissing-prototypes -Wpointer-arith -Winline
> -Wcast-qual  -fformat-extensions -std=c99 -g -nostdinc -I-  -I.
> -I/usr/src/sys -I/usr/src/sys/contrib/altq
> -I/usr/src/sys/contrib/ipfilter -I/usr/src/sys/contrib/pf
> -I/usr/src/sys/dev/ath -I/usr/src/sys/contrib/ngatm
> -I/usr/src/sys/dev/twa -I/usr/src/sys/dev/em -I/usr/src/sys/dev/em
> -D_KERNEL -DHAVE_KERNEL_OPTION_HEADERS -include opt_global.h
> -fno-common -finline-limit=8000 --param inline-unit-growth=100
> --param large-function-growth=1000  -mno-align-long-strings
> -mpreferred-stack-boundary=2  -mno-mmx -mno-3dnow -mno-sse -mno-sse2
> -ffreestanding -Werror  /usr/src/sys/dev/eisa/eisaconf.c
> cc -c -O -pipe  -Wall -Wredundant-decls -Wnested-externs
> -Wstrict-prototypes  -Wmissing-prototypes -Wpointer-arith -Winline
> -Wcast-qual  -fformat-extensions -std=c99 -g -nostdinc -I-  -I.
> -I/usr/src/sys -I/usr/src/sys/contrib/altq
> -I/usr/src/sys/contrib/ipfilter -I/usr/src/sys/contrib/pf
> -I/usr/src/sys/dev/ath -I/usr/src/sys/contrib/ngatm
> -I/usr/src/sys/dev/twa -I/usr/src/sys/dev/em -I/usr/src/sys/dev/em
> -D_KERNEL -DHAVE_KERNEL_OPTION_HEADERS -include opt_global.h
> -fno-common -finline-limit=8000 --param inline-unit-growth=100
> --param large-function-growth=1000  -mno-align-long-strings
> -mpreferred-stack-boundary=2  -mno-mmx -mno-3dnow -mno-sse -mno-sse2
> -ffreestanding -Werror  /usr/src/sys/dev/em/if_em.c -I/usr/src/sys/dev/em
> /usr/src/sys/dev/em/if_em.c: In function `em_init_locked':
> /usr/src/sys/dev/em/if_em.c:1299: error: structure has no member
> named `laa_is_present'
> /usr/src/sys/dev/em/if_em.c: In function `em_local_timer':
> /usr/src/sys/dev/em/if_em.c:2400: error: structure has no member
> named `mac_type'
> /usr/src/sys/dev/em/if_em.c:2401: error: structure has no member
> named `laa_is_present'
> *** Error code 1
>
> Stop in /usr/obj/usr/src/sys/router.
> *** Error code 1
>
> Stop in /usr/src.
> *** Error code 1
>
> Stop in /usr/src.
> 1[sparerouter]#

Added a fix back, but did so in the old form, just fixed this.
I apologize, but all the badgering I've had in the last day made
me feel pressured and I got sloppy.

Hopefully all is now right,

Jack