svn commit: r235527 - stable/9/sys/dev/e1000

[Dimitry Andric]

On 2012-05-17 00:22, Jack F Vogel wrote:> Author: jfv
> Date: Wed May 16 22:22:52 2012
> New Revision: 235527
> URL: http://svn.freebsd.org/changeset/base/235527
> 
> Log:
>   MFC of the e1000 drivers: revisions include
>   227309,228281,228386,228387,228393,228405,
>   228415,228788,228803,229606,229767,229939,
>   230023,230024,230742,231796,232238,233708,
>   234154,234665,235256
...

Hi Jack,

Some of the netmap-related changes in this merge don't work, at least
not for the LINT kernels:

  TB --- 2012-05-17 07:31:43 - /usr/bin/make -B buildkernel KERNCONF=LINT
  ...
  cc1: warnings being treated as errors
  /src/sys/dev/e1000/if_em.c: In function 'em_setup_transmit_ring':
  /src/sys/dev/e1000/if_em.c:3332: warning: implicit declaration of function 'netmap_idx_n2k'
  /src/sys/dev/e1000/if_em.c:3332: warning: nested extern declaration of 'netmap_idx_n2k' [-Wnested-externs]
  /src/sys/dev/e1000/if_em.c: In function 'em_txeof':
  /src/sys/dev/e1000/if_em.c:3795: error: 'struct netmap_adapter' has no member named 'tx_si'
  /src/sys/dev/e1000/if_em.c: In function 'em_rxeof':
  /src/sys/dev/e1000/if_em.c:4407: error: 'struct netmap_adapter' has no member named 'rx_si'
  *** Error code 1

Can you please have a look at it?