Received: from cvs.netbsd.org (unknown [IPv6:2001:4f8:4:7:2e0:81ff:fe30:95bd]) by mail.netbsd.org (Postfix) with ESMTP id DD22263B269 for ; Mon, 24 Mar 2008 20:50:33 +0000 (UTC) Received: by cvs.netbsd.org (Postfix, from userid 500) id C2DF0175D0; Mon, 24 Mar 2008 20:50:33 +0000 (UTC) From: Manuel Bouyer Subject: CVS commit: [netbsd-4] src/sys/dev/ic To: source-changes@NetBSD.org Reply-To: bouyer@netbsd.org Message-Id: <20080324205033.C2DF0175D0@cvs.netbsd.org> Date: Mon, 24 Mar 2008 20:50:33 +0000 (UTC) Module Name: src Committed By: bouyer Date: Mon Mar 24 20:50:33 UTC 2008 Modified Files: src/sys/dev/ic [netbsd-4]: rtl8169.c rtl81x9reg.h Log Message: Pull up following revision(s) (requested by tsutsui in ticket #1105): sys/dev/ic/rtl8169.c: revisions 1.94, 1.95, 1.97, 1.98 sys/dev/ic/rtl81x9reg.h: revision 1.28 No need to preserve RE_NTXDESC_RSVD on re_start(). FreeBSD says "16 bits" comment about RTK_GTXSTART was incorrect. Use CSR_WRITE_1() for it. (though the previous code also worked) Don't fetch DMA descriptor after BUS_DMASYNC_PREREAD op. It looks vlan tag info must appear not only in the first descriptor but in all descriptors of a multi-descriptor transmission attempt on re(4). Problem was reported and fix was confirmed by Chris Brookes on tech-net. Should also close PR kern/37959. To generate a diff of this commit: cvs rdiff -r1.72.2.8 -r1.72.2.9 src/sys/dev/ic/rtl8169.c cvs rdiff -r1.25.2.2 -r1.25.2.3 src/sys/dev/ic/rtl81x9reg.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.