diff options
-rw-r--r-- | drivers/net/tg3.c | 1 | ||||
-rw-r--r-- | drivers/net/tg3.h | 3 |
2 files changed, 3 insertions, 1 deletions
diff --git a/drivers/net/tg3.c b/drivers/net/tg3.c index 47a4f0947872..fc9df25f76b1 100644 --- a/drivers/net/tg3.c +++ b/drivers/net/tg3.c | |||
@@ -13755,6 +13755,7 @@ static char * __devinit tg3_phy_string(struct tg3 *tp) | |||
13755 | case PHY_ID_BCM5756: return "5722/5756"; | 13755 | case PHY_ID_BCM5756: return "5722/5756"; |
13756 | case PHY_ID_BCM5906: return "5906"; | 13756 | case PHY_ID_BCM5906: return "5906"; |
13757 | case PHY_ID_BCM5761: return "5761"; | 13757 | case PHY_ID_BCM5761: return "5761"; |
13758 | case PHY_ID_BCM5717: return "5717"; | ||
13758 | case PHY_ID_BCM8002: return "8002/serdes"; | 13759 | case PHY_ID_BCM8002: return "8002/serdes"; |
13759 | case 0: return "serdes"; | 13760 | case 0: return "serdes"; |
13760 | default: return "unknown"; | 13761 | default: return "unknown"; |
diff --git a/drivers/net/tg3.h b/drivers/net/tg3.h index d770da124b85..e0a8b611fc2f 100644 --- a/drivers/net/tg3.h +++ b/drivers/net/tg3.h | |||
@@ -2855,6 +2855,7 @@ struct tg3 { | |||
2855 | #define PHY_ID_BCM5756 0xbc050ed0 | 2855 | #define PHY_ID_BCM5756 0xbc050ed0 |
2856 | #define PHY_ID_BCM5784 0xbc050fa0 | 2856 | #define PHY_ID_BCM5784 0xbc050fa0 |
2857 | #define PHY_ID_BCM5761 0xbc050fd0 | 2857 | #define PHY_ID_BCM5761 0xbc050fd0 |
2858 | #define PHY_ID_BCM5717 0x5c0d8a00 | ||
2858 | #define PHY_ID_BCM5906 0xdc00ac40 | 2859 | #define PHY_ID_BCM5906 0xdc00ac40 |
2859 | #define PHY_ID_BCM8002 0x60010140 | 2860 | #define PHY_ID_BCM8002 0x60010140 |
2860 | #define PHY_ID_INVALID 0xffffffff | 2861 | #define PHY_ID_INVALID 0xffffffff |
@@ -2896,7 +2897,7 @@ struct tg3 { | |||
2896 | (X) == PHY_ID_BCM5780 || (X) == PHY_ID_BCM5787 || \ | 2897 | (X) == PHY_ID_BCM5780 || (X) == PHY_ID_BCM5787 || \ |
2897 | (X) == PHY_ID_BCM5755 || (X) == PHY_ID_BCM5756 || \ | 2898 | (X) == PHY_ID_BCM5755 || (X) == PHY_ID_BCM5756 || \ |
2898 | (X) == PHY_ID_BCM5906 || (X) == PHY_ID_BCM5761 || \ | 2899 | (X) == PHY_ID_BCM5906 || (X) == PHY_ID_BCM5761 || \ |
2899 | (X) == PHY_ID_BCM8002) | 2900 | (X) == PHY_ID_BCM5717 || (X) == PHY_ID_BCM8002) |
2900 | 2901 | ||
2901 | struct tg3_hw_stats *hw_stats; | 2902 | struct tg3_hw_stats *hw_stats; |
2902 | dma_addr_t stats_mapping; | 2903 | dma_addr_t stats_mapping; |