From 7f7c4072ea552f97a0898331322f71986a97299c Mon Sep 17 00:00:00 2001 From: Matheos Worku Date: Thu, 24 Apr 2008 21:02:37 -0700 Subject: niu: Determine the # of ports from the card's VPD data [ Fix minor whitespace and coding style stuff... -DaveM ] Signed-off-by: Matheos Worku Signed-off-by: David S. Miller --- drivers/net/niu.h | 9 +++++++++ 1 file changed, 9 insertions(+) (limited to 'drivers/net/niu.h') diff --git a/drivers/net/niu.h b/drivers/net/niu.h index 336aed08b27..35e9afb23bd 100644 --- a/drivers/net/niu.h +++ b/drivers/net/niu.h @@ -2937,6 +2937,15 @@ struct rx_ring_info { #define NIU_MAX_MTU 9216 +/* VPD strings */ +#define NIU_QGC_LP_BM_STR "501-7606" +#define NIU_2XGF_LP_BM_STR "501-7283" +#define NIU_QGC_PEM_BM_STR "501-7765" +#define NIU_2XGF_PEM_BM_STR "501-7626" +#define NIU_ALONSO_BM_STR "373-0202" +#define NIU_FOXXY_BM_STR "501-7961" +#define NIU_2XGF_MRVL_BM_STR "SK-6E82" + #define NIU_VPD_MIN_MAJOR 3 #define NIU_VPD_MIN_MINOR 4 -- cgit v1.2.3 From a5d6ab56daa439d681aab29955498486e452224d Mon Sep 17 00:00:00 2001 From: Matheos Worku Date: Thu, 24 Apr 2008 21:09:20 -0700 Subject: niu: Add support for Neptune FEM/NEM cards for C10 server blades [ Minor coding style and whitespace corrections, also bump driver version and release date. -DaveM ] Signed-off-by: Matheos Worku Signed-off-by: David S. Miller --- drivers/net/niu.h | 3 +++ 1 file changed, 3 insertions(+) (limited to 'drivers/net/niu.h') diff --git a/drivers/net/niu.h b/drivers/net/niu.h index 35e9afb23bd..97ffbe137bc 100644 --- a/drivers/net/niu.h +++ b/drivers/net/niu.h @@ -2537,6 +2537,7 @@ struct fcram_hash_ipv6 { #define NIU_PHY_ID_MASK 0xfffff0f0 #define NIU_PHY_ID_BCM8704 0x00206030 +#define NIU_PHY_ID_BCM8706 0x00206035 #define NIU_PHY_ID_BCM5464R 0x002060b0 #define NIU_PHY_ID_MRVL88X2011 0x01410020 @@ -3208,6 +3209,8 @@ struct niu { struct niu_parent *parent; u32 flags; +#define NIU_FLAGS_HOTPLUG_PHY_PRESENT 0x02000000 /* Removebale PHY detected*/ +#define NIU_FLAGS_HOTPLUG_PHY 0x01000000 /* Removebale PHY */ #define NIU_FLAGS_VPD_VALID 0x00800000 /* VPD has valid version */ #define NIU_FLAGS_MSIX 0x00400000 /* MSI-X in use */ #define NIU_FLAGS_MCAST 0x00200000 /* multicast filter enabled */ -- cgit v1.2.3