Module Name: src
Committed By: msaitoh
Date: Mon Jul 29 08:11:53 UTC 2013
Modified Files:
src/share/man/man4 [netbsd-6]: re.4
src/sys/dev/ic [netbsd-6]: rtl8169.c rtl81x9reg.h
Log Message:
Pull up following revision(s) (requested by khorben in ticket #913):
sys/dev/ic/rtl8169.c: revision 1.137
sys/dev/ic/rtl81x9reg.h: revision 1.44
share/man/man4/re.4: revision 1.14
Added support for the Realtek 8168F variant in re(4).
>From FreeBSD; not tested on real hardware unfortunately. The manual page
was adjusted as well.
No objection from current-users@, "commit it" gdt@
To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.13.10.1 src/share/man/man4/re.4
cvs rdiff -u -r1.134.4.1 -r1.134.4.2 src/sys/dev/ic/rtl8169.c
cvs rdiff -u -r1.42.4.1 -r1.42.4.2 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.
Modified files:
Index: src/share/man/man4/re.4
diff -u src/share/man/man4/re.4:1.13 src/share/man/man4/re.4:1.13.10.1
--- src/share/man/man4/re.4:1.13 Fri Jan 15 19:24:49 2010
+++ src/share/man/man4/re.4 Mon Jul 29 08:11:53 2013
@@ -1,4 +1,4 @@
-.\" $NetBSD: re.4,v 1.13 2010/01/15 19:24:49 joerg Exp $
+.\" $NetBSD: re.4,v 1.13.10.1 2013/07/29 08:11:53 msaitoh Exp $
.\"
.\" Copyright (c) 2003
.\" Bill Paul <wp...@windriver.com>. All rights reserved.
@@ -32,12 +32,12 @@
.\"
.\" $FreeBSD: src/share/man/man4/re.4,v 1.4 2004/03/04 06:42:46 sanpei Exp $
.\"
-.Dd January 8, 2007
+.Dd April 6, 2013
.Dt RE 4
.Os
.Sh NAME
.Nm re
-.Nd "RealTek 8139C+/8169/8169S/8110S PCI Ethernet adapter driver"
+.Nd "RealTek 8139C+/8169/8169S/8168/8110S/8111 PCI Ethernet adapter driver"
.Sh SYNOPSIS
.Cd "re* at pci? dev ? function ?"
.Cd "re* at cardbus? function ?"
@@ -45,8 +45,8 @@
The
.Nm
driver provides support for various NICs based on the RealTek RTL8139C+,
-RTL8169, RTL8169S, and RTL8110S PCI/Cardbus Ethernet controllers, including
-the following:
+RTL8169, RTL8169S, RTL8168, and RTL8110S PCI/Cardbus Ethernet controllers,
+including the following:
.Pp
.Bl -bullet -compact
.It
@@ -73,7 +73,7 @@ Linksys EG1032 rev. 3 Gigabit Ethernet (
.Pp
NICs based on the 8139C+ are capable of 10 and 100Mbps speeds over
CAT5 cable.
-NICs based on the 8169, 8169S, and 8110S are capable of 10, 100, and
+NICs based on the 8169, 8169S, 8168, and 8110S are capable of 10, 100, and
1000Mbps operation.
.Pp
All NICs supported by the
Index: src/sys/dev/ic/rtl8169.c
diff -u src/sys/dev/ic/rtl8169.c:1.134.4.1 src/sys/dev/ic/rtl8169.c:1.134.4.2
--- src/sys/dev/ic/rtl8169.c:1.134.4.1 Mon Mar 5 20:31:49 2012
+++ src/sys/dev/ic/rtl8169.c Mon Jul 29 08:11:53 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: rtl8169.c,v 1.134.4.1 2012/03/05 20:31:49 sborrill Exp $ */
+/* $NetBSD: rtl8169.c,v 1.134.4.2 2013/07/29 08:11:53 msaitoh Exp $ */
/*
* Copyright (c) 1997, 1998-2003
@@ -33,11 +33,11 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rtl8169.c,v 1.134.4.1 2012/03/05 20:31:49 sborrill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rtl8169.c,v 1.134.4.2 2013/07/29 08:11:53 msaitoh Exp $");
/* $FreeBSD: /repoman/r/ncvs/src/sys/dev/re/if_re.c,v 1.20 2004/04/11 20:34:08 ru Exp $ */
/*
- * RealTek 8139C+/8169/8169S/8110S PCI NIC driver
+ * RealTek 8139C+/8169/8169S/8168/8110S PCI NIC driver
*
* Written by Bill Paul <wp...@windriver.com>
* Senior Networking Software Engineer
@@ -47,8 +47,8 @@ __KERNEL_RCSID(0, "$NetBSD: rtl8169.c,v
/*
* This driver is designed to support RealTek's next generation of
* 10/100 and 10/100/1000 PCI ethernet controllers. There are currently
- * four devices in this family: the RTL8139C+, the RTL8169, the RTL8169S
- * and the RTL8110S.
+ * six devices in this family: the RTL8139C+, the RTL8169, the RTL8169S,
+ * RTL8110S, the RTL8168 and the RTL8111.
*
* The 8139C+ is a 10/100 ethernet chip. It is backwards compatible
* with the older 8139 family, however it also supports a special
@@ -607,6 +607,7 @@ re_attach(struct rtk_softc *sc)
RTKQ_NOJUMBO;
break;
case RTK_HWREV_8168E_VL:
+ case RTK_HWREV_8168F:
sc->sc_quirk |= RTKQ_DESCV2 | RTKQ_NOEECMD |
RTKQ_MACSTAT | RTKQ_CMDSTOP | RTKQ_NOJUMBO;
break;
Index: src/sys/dev/ic/rtl81x9reg.h
diff -u src/sys/dev/ic/rtl81x9reg.h:1.42.4.1 src/sys/dev/ic/rtl81x9reg.h:1.42.4.2
--- src/sys/dev/ic/rtl81x9reg.h:1.42.4.1 Mon Mar 5 20:31:49 2012
+++ src/sys/dev/ic/rtl81x9reg.h Mon Jul 29 08:11:53 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: rtl81x9reg.h,v 1.42.4.1 2012/03/05 20:31:49 sborrill Exp $ */
+/* $NetBSD: rtl81x9reg.h,v 1.42.4.2 2013/07/29 08:11:53 msaitoh Exp $ */
/*
* Copyright (c) 1997, 1998
@@ -164,6 +164,7 @@
#define RTK_HWREV_8168DP 0x28800000
#define RTK_HWREV_8168E 0x2C000000
#define RTK_HWREV_8168E_VL 0x2C800000
+#define RTK_HWREV_8168F 0x48000000
#define RTK_HWREV_8168_SPIN1 0x30000000
#define RTK_HWREV_8100E 0x30800000
#define RTK_HWREV_8101E 0x34000000
