--- src/sys/dev/netif/re/if_re.c	2008/10/09 12:41:02	1.73
+++ src/sys/dev/netif/re/if_re.c	2008/10/09 14:30:48	1.74
@@ -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