Module Name: src
Committed By: jakllsch
Date: Sat Sep 4 19:27:43 UTC 2021
Modified Files:
src/sys/dev/ic: rtl8169.c
Log Message:
re(4): misc chip revision support changes
* remove impossible-to-match chip revision cases
* bring support for modern chips in line with FreeBSD and OpenBSD
* adds support for RTL8168GU
Addresses PR kern/56312.
To generate a diff of this commit:
cvs rdiff -u -r1.167 -r1.168 src/sys/dev/ic/rtl8169.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/ic/rtl8169.c
diff -u src/sys/dev/ic/rtl8169.c:1.167 src/sys/dev/ic/rtl8169.c:1.168
--- src/sys/dev/ic/rtl8169.c:1.167 Mon Sep 21 06:57:00 2020
+++ src/sys/dev/ic/rtl8169.c Sat Sep 4 19:27:43 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: rtl8169.c,v 1.167 2020/09/21 06:57:00 msaitoh Exp $ */
+/* $NetBSD: rtl8169.c,v 1.168 2021/09/04 19:27:43 jakllsch Exp $ */
/*
* Copyright (c) 1997, 1998-2003
@@ -33,7 +33,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rtl8169.c,v 1.167 2020/09/21 06:57:00 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rtl8169.c,v 1.168 2021/09/04 19:27:43 jakllsch Exp $");
/* $FreeBSD: /repoman/r/ncvs/src/sys/dev/re/if_re.c,v 1.20 2004/04/11 20:34:08 ru Exp $ */
/*
@@ -665,17 +665,10 @@ re_attach(struct rtk_softc *sc)
sc->sc_quirk |= RTKQ_NOJUMBO;
break;
case RTK_HWREV_8168E:
- case RTK_HWREV_8168H_SPIN1:
sc->sc_quirk |= RTKQ_DESCV2 | RTKQ_NOEECMD |
RTKQ_MACSTAT | RTKQ_CMDSTOP | RTKQ_PHYWAKE_PM |
RTKQ_NOJUMBO;
break;
- case RTK_HWREV_8168H:
- case RTK_HWREV_8168FP:
- sc->sc_quirk |= RTKQ_DESCV2 | RTKQ_NOEECMD |
- RTKQ_MACSTAT | RTKQ_CMDSTOP | RTKQ_PHYWAKE_PM |
- RTKQ_NOJUMBO | RTKQ_RXDV_GATED | RTKQ_TXRXEN_LATER;
- break;
case RTK_HWREV_8168E_VL:
case RTK_HWREV_8168F:
case RTK_HWREV_8411:
@@ -683,13 +676,14 @@ re_attach(struct rtk_softc *sc)
RTKQ_MACSTAT | RTKQ_CMDSTOP | RTKQ_NOJUMBO;
break;
case RTK_HWREV_8168EP:
+ case RTK_HWREV_8168FP:
case RTK_HWREV_8168G:
- case RTK_HWREV_8168G_SPIN1:
- case RTK_HWREV_8168G_SPIN2:
+ case RTK_HWREV_8168GU:
+ case RTK_HWREV_8168H:
case RTK_HWREV_8411B:
sc->sc_quirk |= RTKQ_DESCV2 | RTKQ_NOEECMD |
RTKQ_MACSTAT | RTKQ_CMDSTOP | RTKQ_NOJUMBO |
- RTKQ_RXDV_GATED;
+ RTKQ_RXDV_GATED | RTKQ_TXRXEN_LATER;
break;
case RTK_HWREV_8100E:
case RTK_HWREV_8100E_SPIN2:
