diff options
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/net/tg3.c | 3 | ||||
-rw-r--r-- | drivers/net/tg3.h | 6 |
2 files changed, 6 insertions, 3 deletions
diff --git a/drivers/net/tg3.c b/drivers/net/tg3.c index adb579f0d75d..4a653478edd6 100644 --- a/drivers/net/tg3.c +++ b/drivers/net/tg3.c | |||
@@ -14170,7 +14170,8 @@ static char * __devinit tg3_phy_string(struct tg3 *tp) | |||
14170 | case PHY_ID_BCM5756: return "5722/5756"; | 14170 | case PHY_ID_BCM5756: return "5722/5756"; |
14171 | case PHY_ID_BCM5906: return "5906"; | 14171 | case PHY_ID_BCM5906: return "5906"; |
14172 | case PHY_ID_BCM5761: return "5761"; | 14172 | case PHY_ID_BCM5761: return "5761"; |
14173 | case PHY_ID_BCM5717: return "5717"; | 14173 | case PHY_ID_BCM5718C: return "5718C"; |
14174 | case PHY_ID_BCM5718S: return "5718S"; | ||
14174 | case PHY_ID_BCM8002: return "8002/serdes"; | 14175 | case PHY_ID_BCM8002: return "8002/serdes"; |
14175 | case 0: return "serdes"; | 14176 | case 0: return "serdes"; |
14176 | default: return "unknown"; | 14177 | default: return "unknown"; |
diff --git a/drivers/net/tg3.h b/drivers/net/tg3.h index 91139fdf7f43..edb7a14cf58f 100644 --- a/drivers/net/tg3.h +++ b/drivers/net/tg3.h | |||
@@ -2893,7 +2893,8 @@ struct tg3 { | |||
2893 | #define PHY_ID_BCM5756 0xbc050ed0 | 2893 | #define PHY_ID_BCM5756 0xbc050ed0 |
2894 | #define PHY_ID_BCM5784 0xbc050fa0 | 2894 | #define PHY_ID_BCM5784 0xbc050fa0 |
2895 | #define PHY_ID_BCM5761 0xbc050fd0 | 2895 | #define PHY_ID_BCM5761 0xbc050fd0 |
2896 | #define PHY_ID_BCM5717 0x5c0d8a00 | 2896 | #define PHY_ID_BCM5718C 0x5c0d8a00 |
2897 | #define PHY_ID_BCM5718S 0xbc050ff0 | ||
2897 | #define PHY_ID_BCM5906 0xdc00ac40 | 2898 | #define PHY_ID_BCM5906 0xdc00ac40 |
2898 | #define PHY_ID_BCM8002 0x60010140 | 2899 | #define PHY_ID_BCM8002 0x60010140 |
2899 | #define PHY_ID_INVALID 0xffffffff | 2900 | #define PHY_ID_INVALID 0xffffffff |
@@ -2936,7 +2937,8 @@ struct tg3 { | |||
2936 | (X) == PHY_ID_BCM5780 || (X) == PHY_ID_BCM5787 || \ | 2937 | (X) == PHY_ID_BCM5780 || (X) == PHY_ID_BCM5787 || \ |
2937 | (X) == PHY_ID_BCM5755 || (X) == PHY_ID_BCM5756 || \ | 2938 | (X) == PHY_ID_BCM5755 || (X) == PHY_ID_BCM5756 || \ |
2938 | (X) == PHY_ID_BCM5906 || (X) == PHY_ID_BCM5761 || \ | 2939 | (X) == PHY_ID_BCM5906 || (X) == PHY_ID_BCM5761 || \ |
2939 | (X) == PHY_ID_BCM5717 || (X) == PHY_ID_BCM8002) | 2940 | (X) == PHY_ID_BCM5718C || (X) == PHY_ID_BCM5718S || \ |
2941 | (X) == PHY_ID_BCM8002) | ||
2940 | 2942 | ||
2941 | struct tg3_hw_stats *hw_stats; | 2943 | struct tg3_hw_stats *hw_stats; |
2942 | dma_addr_t stats_mapping; | 2944 | dma_addr_t stats_mapping; |