aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/net/tg3.c7
-rw-r--r--drivers/net/tg3.h3
2 files changed, 9 insertions, 1 deletions
diff --git a/drivers/net/tg3.c b/drivers/net/tg3.c
index 78102023aa93..eaed2aa09e1f 100644
--- a/drivers/net/tg3.c
+++ b/drivers/net/tg3.c
@@ -244,6 +244,12 @@ static DEFINE_PCI_DEVICE_TABLE(tg3_pci_tbl) = {
244 {PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, TG3PCI_DEVICE_TIGON3_5717)}, 244 {PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, TG3PCI_DEVICE_TIGON3_5717)},
245 {PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, TG3PCI_DEVICE_TIGON3_5718)}, 245 {PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, TG3PCI_DEVICE_TIGON3_5718)},
246 {PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, TG3PCI_DEVICE_TIGON3_5724)}, 246 {PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, TG3PCI_DEVICE_TIGON3_5724)},
247 {PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, TG3PCI_DEVICE_TIGON3_57781)},
248 {PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, TG3PCI_DEVICE_TIGON3_57785)},
249 {PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, TG3PCI_DEVICE_TIGON3_57761)},
250 {PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, TG3PCI_DEVICE_TIGON3_57765)},
251 {PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, TG3PCI_DEVICE_TIGON3_57791)},
252 {PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, TG3PCI_DEVICE_TIGON3_57795)},
247 {PCI_DEVICE(PCI_VENDOR_ID_SYSKONNECT, PCI_DEVICE_ID_SYSKONNECT_9DXX)}, 253 {PCI_DEVICE(PCI_VENDOR_ID_SYSKONNECT, PCI_DEVICE_ID_SYSKONNECT_9DXX)},
248 {PCI_DEVICE(PCI_VENDOR_ID_SYSKONNECT, PCI_DEVICE_ID_SYSKONNECT_9MXX)}, 254 {PCI_DEVICE(PCI_VENDOR_ID_SYSKONNECT, PCI_DEVICE_ID_SYSKONNECT_9MXX)},
249 {PCI_DEVICE(PCI_VENDOR_ID_ALTIMA, PCI_DEVICE_ID_ALTIMA_AC1000)}, 255 {PCI_DEVICE(PCI_VENDOR_ID_ALTIMA, PCI_DEVICE_ID_ALTIMA_AC1000)},
@@ -14199,6 +14205,7 @@ static char * __devinit tg3_phy_string(struct tg3 *tp)
14199 case PHY_ID_BCM5761: return "5761"; 14205 case PHY_ID_BCM5761: return "5761";
14200 case PHY_ID_BCM5718C: return "5718C"; 14206 case PHY_ID_BCM5718C: return "5718C";
14201 case PHY_ID_BCM5718S: return "5718S"; 14207 case PHY_ID_BCM5718S: return "5718S";
14208 case PHY_ID_BCM57765: return "57765";
14202 case PHY_ID_BCM8002: return "8002/serdes"; 14209 case PHY_ID_BCM8002: return "8002/serdes";
14203 case 0: return "serdes"; 14210 case 0: return "serdes";
14204 default: return "unknown"; 14211 default: return "unknown";
diff --git a/drivers/net/tg3.h b/drivers/net/tg3.h
index edb7a14cf58f..34c9ef4b74a3 100644
--- a/drivers/net/tg3.h
+++ b/drivers/net/tg3.h
@@ -2895,6 +2895,7 @@ struct tg3 {
2895#define PHY_ID_BCM5761 0xbc050fd0 2895#define PHY_ID_BCM5761 0xbc050fd0
2896#define PHY_ID_BCM5718C 0x5c0d8a00 2896#define PHY_ID_BCM5718C 0x5c0d8a00
2897#define PHY_ID_BCM5718S 0xbc050ff0 2897#define PHY_ID_BCM5718S 0xbc050ff0
2898#define PHY_ID_BCM57765 0x5c0d8a40
2898#define PHY_ID_BCM5906 0xdc00ac40 2899#define PHY_ID_BCM5906 0xdc00ac40
2899#define PHY_ID_BCM8002 0x60010140 2900#define PHY_ID_BCM8002 0x60010140
2900#define PHY_ID_INVALID 0xffffffff 2901#define PHY_ID_INVALID 0xffffffff
@@ -2938,7 +2939,7 @@ struct tg3 {
2938 (X) == PHY_ID_BCM5755 || (X) == PHY_ID_BCM5756 || \ 2939 (X) == PHY_ID_BCM5755 || (X) == PHY_ID_BCM5756 || \
2939 (X) == PHY_ID_BCM5906 || (X) == PHY_ID_BCM5761 || \ 2940 (X) == PHY_ID_BCM5906 || (X) == PHY_ID_BCM5761 || \
2940 (X) == PHY_ID_BCM5718C || (X) == PHY_ID_BCM5718S || \ 2941 (X) == PHY_ID_BCM5718C || (X) == PHY_ID_BCM5718S || \
2941 (X) == PHY_ID_BCM8002) 2942 (X) == PHY_ID_BCM57765 || (X) == PHY_ID_BCM8002)
2942 2943
2943 struct tg3_hw_stats *hw_stats; 2944 struct tg3_hw_stats *hw_stats;
2944 dma_addr_t stats_mapping; 2945 dma_addr_t stats_mapping;