From owner-svn-src-stable-9@FreeBSD.ORG  Thu May 17 13:31:01 2012
Return-Path: <owner-svn-src-stable-9@FreeBSD.ORG>
Delivered-To: svn-src-stable-9@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 775A91065673;
	Thu, 17 May 2012 13:31:01 +0000 (UTC)
	(envelope-from luigi@onelab2.iet.unipi.it)
Received: from onelab2.iet.unipi.it (onelab2.iet.unipi.it [131.114.59.238])
	by mx1.freebsd.org (Postfix) with ESMTP id 2E8B48FC17;
	Thu, 17 May 2012 13:31:00 +0000 (UTC)
Received: by onelab2.iet.unipi.it (Postfix, from userid 275)
	id 1421F73027; Thu, 17 May 2012 15:51:14 +0200 (CEST)
Date: Thu, 17 May 2012 15:51:14 +0200
From: Luigi Rizzo <rizzo@iet.unipi.it>
To: Dimitry Andric <dim@FreeBSD.org>
Message-ID: <20120517135114.GA93530@onelab2.iet.unipi.it>
References: <201205162222.q4GMMqig065119@svn.freebsd.org>
	<4FB4F639.5070700@FreeBSD.org>
Mime-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <4FB4F639.5070700@FreeBSD.org>
User-Agent: Mutt/1.4.2.3i
Cc: Jack F Vogel <jfv@FreeBSD.org>, svn-src-stable@freebsd.org,
	svn-src-all@freebsd.org, src-committers@freebsd.org,
	svn-src-stable-9@freebsd.org
Subject: Re: svn commit: r235527 - stable/9/sys/dev/e1000
X-BeenThere: svn-src-stable-9@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for only the 9-stable src tree
	<svn-src-stable-9.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-9>, 
	<mailto:svn-src-stable-9-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable-9>
List-Post: <mailto:svn-src-stable-9@freebsd.org>
List-Help: <mailto:svn-src-stable-9-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-9>, 
	<mailto:svn-src-stable-9-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 17 May 2012 13:31:01 -0000

On Thu, May 17, 2012 at 02:59:37PM +0200, Dimitry Andric wrote:
> 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

i will take care of this later today.
it is probably due to the dev/netmap/* code not in sync
with the one in HEAD (i thought i had MFC'ed it but
maybe i forgot)

cheers
luigi

> Can you please have a look at it?