diff options
| author | Matheos Worku <matheos.worku@sun.com> | 2008-04-24 21:09:20 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-04-24 21:09:20 -0700 |
| commit | a5d6ab56daa439d681aab29955498486e452224d (patch) | |
| tree | d15731cee64cfba3ef8e9d992574728cb4e4625c /drivers/net/niu.h | |
| parent | 7f7c4072ea552f97a0898331322f71986a97299c (diff) | |
| download | kernel-common-a5d6ab56daa439d681aab29955498486e452224d.tar.gz kernel-common-a5d6ab56daa439d681aab29955498486e452224d.tar.bz2 kernel-common-a5d6ab56daa439d681aab29955498486e452224d.zip | |
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 <matheos.worku@sun.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/niu.h')
| -rw-r--r-- | drivers/net/niu.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/net/niu.h b/drivers/net/niu.h index 35e9afb23bdf..97ffbe137bcb 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 */ |