cvs commit: src/sys/dev/em LICENSE README if_em.c if_em.h if_em_hw.c if_em_hw.h if_em_osdep.h

[John Baldwin]

On Wednesday 06 September 2006 13:26, LI Xin wrote:
> Bruce A. Mah wrote:
> > If memory serves me right, John Baldwin wrote:
> >> jhb         2006-09-05 19:48:10 UTC
> >>
> >>   FreeBSD src repository
> >>
> >>   Modified files:        (Branch: RELENG_4)
> >>     sys/dev/em           LICENSE README if_em.c if_em.h if_em_hw.c 
> >>                          if_em_hw.h if_em_osdep.h 
> >>   Log:
> >>   Sync up with most of the changes to RELENG_6 including using bus_dma,
> >>   new PCI IDs, lots of style changes, suspend/resume methods.  Things not
> >>   included include the INTR_FAST + taskqueue changes, link flapping
> >>   workarounds in em_ioctl(), and jumbo frame fixups for architectures 
that
> >>   require strict alignment.
> >>   
> >>   Revision  Changes      Path
> >>   1.1.2.3   +3 -1        src/sys/dev/em/LICENSE
> >>   1.1.2.10  +65 -23      src/sys/dev/em/README
> >>   1.2.2.24  +1867 -1498  src/sys/dev/em/if_em.c
> >>   1.1.2.19  +165 -185    src/sys/dev/em/if_em.h
> >>   1.1.2.14  +3236 -756   src/sys/dev/em/if_em_hw.c
> >>   1.1.2.14  +807 -56     src/sys/dev/em/if_em_hw.h
> >>   1.1.2.16  +63 -32      src/sys/dev/em/if_em_osdep.h
> > 
> > Does this basically mean that RELENG_4 now has version 6.1.4 of em(4)?
> 
> My understanding is that now we have 6.1.4's hardware support available
> in RELENG_4, but not the performance enhancements and fixes that does
> not apply to RELENG_4.  According to the code it appears like that the
> driver will claim itself as "6.1.4", though.  So perhaps we can wrap it
> as "The hardware support and suspend/resume methods of &man.em.4;
> has been updated to the same version available from Intel's &man.em.4;
> driver version 6.1.4."?

Actually, most of the driver is the same.  The INTR_FAST + taskqueue stuff 
doesn't affect functionality, and that's the only really big diff.  The 
if_em_hw.[ch] files are identical, for example.

-- 
John Baldwin