From owner-cvs-all@FreeBSD.ORG Wed Sep 6 20:16:19 2006 Return-Path: X-Original-To: cvs-all@freebsd.org Delivered-To: cvs-all@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 8D4B816A6D4; Wed, 6 Sep 2006 20:16:09 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from server.baldwin.cx (66-23-211-162.clients.speedfactory.net [66.23.211.162]) by mx1.FreeBSD.org (Postfix) with ESMTP id AAEDD43D45; Wed, 6 Sep 2006 20:16:08 +0000 (GMT) (envelope-from jhb@freebsd.org) Received: from localhost.corp.yahoo.com (john@localhost [127.0.0.1]) (authenticated bits=0) by server.baldwin.cx (8.13.6/8.13.6) with ESMTP id k86KFnm5078142; Wed, 6 Sep 2006 16:15:53 -0400 (EDT) (envelope-from jhb@freebsd.org) From: John Baldwin To: LI Xin Date: Wed, 6 Sep 2006 15:21:57 -0400 User-Agent: KMail/1.9.1 References: <200609051948.k85JmAv3099269@repoman.freebsd.org> <44FF0250.3080000@freebsd.org> <44FF04E3.50104@delphij.net> In-Reply-To: <44FF04E3.50104@delphij.net> MIME-Version: 1.0 Content-Type: text/plain; charset="iso-8859-15" Content-Transfer-Encoding: 7bit Content-Disposition: inline Message-Id: <200609061521.57827.jhb@freebsd.org> X-Greylist: Sender succeeded SMTP AUTH authentication, not delayed by milter-greylist-2.0.2 (server.baldwin.cx [127.0.0.1]); Wed, 06 Sep 2006 16:15:53 -0400 (EDT) X-Virus-Scanned: ClamAV 0.88.3/1815/Wed Sep 6 11:42:27 2006 on server.baldwin.cx X-Virus-Status: Clean X-Spam-Status: No, score=-4.4 required=4.2 tests=ALL_TRUSTED,AWL,BAYES_00 autolearn=ham version=3.1.3 X-Spam-Checker-Version: SpamAssassin 3.1.3 (2006-06-01) on server.baldwin.cx Cc: "Bruce A. Mah" , src-committers@freebsd.org, cvs-all@freebsd.org, cvs-src@freebsd.org Subject: Re: 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 X-BeenThere: cvs-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: CVS commit messages for the entire tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 06 Sep 2006 20:16:19 -0000 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