Rename some HWREV
authorSepherosa Ziehau <sephe@dragonflybsd.org>
Thu, 9 Oct 2008 14:30:48 +0000 (14:30 +0000)
committerSepherosa Ziehau <sephe@dragonflybsd.org>
Thu, 9 Oct 2008 14:30:48 +0000 (14:30 +0000)
sys/dev/netif/re/if_re.c
sys/dev/netif/re/if_rereg.h

index c8416c6..7a64a96 100644 (file)
@@ -33,7 +33,7 @@
  * THE POSSIBILITY OF SUCH DAMAGE.
  *
  * $FreeBSD: src/sys/dev/re/if_re.c,v 1.25 2004/06/09 14:34:01 naddy Exp $
- * $DragonFly: src/sys/dev/netif/re/if_re.c,v 1.73 2008/10/09 12:41:02 sephe Exp $
+ * $DragonFly: src/sys/dev/netif/re/if_re.c,v 1.74 2008/10/09 14:30:48 sephe Exp $
  */
 
 /*
@@ -172,13 +172,13 @@ static const struct re_type re_devs[] = {
                "RealTek 8101E PCIe 10/100baseTX" },
        { PCI_VENDOR_REALTEK, PCI_PRODUCT_REALTEK_RT8101E, RE_HWREV_8102EL,
                "RealTek 8102EL PCIe 10/100baseTX" },
-       { PCI_VENDOR_REALTEK, PCI_PRODUCT_REALTEK_RT8168, RE_HWREV_8168_SPIN1,
-               "RealTek 8168/8111B PCIe Gigabit Ethernet" },
-       { PCI_VENDOR_REALTEK, PCI_PRODUCT_REALTEK_RT8168, RE_HWREV_8168_SPIN2,
-               "RealTek 8168/8111B PCIe Gigabit Ethernet" },
-       { PCI_VENDOR_REALTEK, PCI_PRODUCT_REALTEK_RT8168, RE_HWREV_8168_SPIN3,
+       { PCI_VENDOR_REALTEK, PCI_PRODUCT_REALTEK_RT8168, RE_HWREV_8168_8111B1,
                "RealTek 8168B/8111B PCIe Gigabit Ethernet" },
-       { PCI_VENDOR_REALTEK, PCI_PRODUCT_REALTEK_RT8168, RE_HWREV_8168C,
+       { PCI_VENDOR_REALTEK, PCI_PRODUCT_REALTEK_RT8168, RE_HWREV_8168_8111B2,
+               "RealTek 8168B/8111B PCIe Gigabit Ethernet" },
+       { PCI_VENDOR_REALTEK, PCI_PRODUCT_REALTEK_RT8168, RE_HWREV_8168_8111B3,
+               "RealTek 8168B/8111B PCIe Gigabit Ethernet" },
+       { PCI_VENDOR_REALTEK, PCI_PRODUCT_REALTEK_RT8168, RE_HWREV_8168_8111C,
                "RealTek 8168C/8111C PCIe Gigabit Ethernet" },
        { PCI_VENDOR_REALTEK, PCI_PRODUCT_REALTEK_RT8169, RE_HWREV_8169,
                "RealTek 8169 Gigabit Ethernet" },
@@ -205,16 +205,16 @@ static const struct re_hwrev re_hwrevs[] = {
        { RE_HWREV_8139CPLUS,   RE_8139CPLUS,   0,
          ETHERMTU, ETHERMTU },
 
-       { RE_HWREV_8168_SPIN1,  RE_8169,        RE_C_HWIM,
+       { RE_HWREV_8168_8111B1, RE_8169,        RE_C_HWIM,
          RE_JUMBO_MTU, RE_JUMBO_MTU },
 
-       { RE_HWREV_8168_SPIN2,  RE_8169,        RE_C_HWIM,
+       { RE_HWREV_8168_8111B2, RE_8169,        RE_C_HWIM,
          RE_JUMBO_MTU, RE_JUMBO_MTU },
 
-       { RE_HWREV_8168_SPIN3,  RE_8169,        RE_C_HWIM,
+       { RE_HWREV_8168_8111B3, RE_8169,        RE_C_HWIM,
          RE_JUMBO_MTU, RE_JUMBO_MTU },
 
-       { RE_HWREV_8168C,       RE_8169,        RE_C_HWIM,
+       { RE_HWREV_8168_8111C,  RE_8169,        RE_C_HWIM,
          RE_JUMBO_MTU, RE_JUMBO_MTU },
 
        { RE_HWREV_8169,        RE_8169,        0,
@@ -1472,7 +1472,7 @@ re_attach(device_t dev)
        ifp->if_capabilities = IFCAP_VLAN_MTU | IFCAP_VLAN_HWTAGGING;
 
        switch (hwrev) {
-       case RE_HWREV_8168C:
+       case RE_HWREV_8168_8111C:
        case RE_HWREV_8102EL:
                /*
                 * XXX Hardware checksum does not work yet on 8168C
index 3729cdb..1ac83a1 100644 (file)
@@ -33,7 +33,7 @@
  * THE POSSIBILITY OF SUCH DAMAGE.
  *
  * $FreeBSD: src/sys/pci/if_rlreg.h,v 1.42 2004/05/24 19:39:23 jhb Exp $
- * $DragonFly: src/sys/dev/netif/re/if_rereg.h,v 1.17 2008/10/09 12:41:02 sephe Exp $
+ * $DragonFly: src/sys/dev/netif/re/if_rereg.h,v 1.18 2008/10/09 14:30:48 sephe Exp $
  */
 
 /*
 #define RE_HWREV_8169S         0x04000000
 #define RE_HWREV_8169_8110SB   0x10000000
 #define RE_HWREV_8169_8110SC   0x18000000
-#define RE_HWREV_8168_SPIN1    0x30000000
+#define RE_HWREV_8168_8111B1   0x30000000
 #define RE_HWREV_8100E         0x30800000
 #define RE_HWREV_8101E         0x34000000
 #define RE_HWREV_8102EL                0x24800000
-#define RE_HWREV_8168_SPIN2    0x38000000
-#define RE_HWREV_8168_SPIN3    0x38400000
-#define RE_HWREV_8168C         0x3c000000
+#define RE_HWREV_8168_8111B2   0x38000000
+#define RE_HWREV_8168_8111B3   0x38400000
+#define RE_HWREV_8168_8111C    0x3c000000
 #define RE_HWREV_8139CPLUS     0x74800000
 
 #define RE_TXDMA_16BYTES       0x00000000