gianfar: Fix skb allocation strategy

[linux-2.6-omap-h63xx.git] / drivers / net / niu.h

diff --git a/drivers/net/niu.h b/drivers/net/niu.h
index 0e8626adc573e2a2ce3bdbf7e6c03bad40a5d3ee..336aed08b27507964394f3cca929c1c2b4112dd4 100644 (file)
--- a/drivers/net/niu.h
+++ b/drivers/net/niu.h
@@ -499,7 +499,7 @@
 #define BMAC_ADDR2                     0x00110UL
 #define  BMAC_ADDR2_ADDR2              0x000000000000ffffULL
 
-#define BMAC_NUM_ALT_ADDR              7
+#define BMAC_NUM_ALT_ADDR              6
 
 #define BMAC_ALT_ADDR0(NUM)            (0x00118UL + (NUM)*0x18UL)
 #define  BMAC_ALT_ADDR0_ADDR0          0x000000000000ffffULL
@@ -3061,6 +3061,7 @@ struct niu_parent {
 #define PLAT_TYPE_NIU          0x02
 #define PLAT_TYPE_VF_P0                0x03
 #define PLAT_TYPE_VF_P1                0x04
+#define PLAT_TYPE_ATCA_CP3220  0x08
 
        u8                      num_ports;
 
@@ -3198,10 +3199,11 @@ struct niu {
        struct niu_parent               *parent;
 
        u32                             flags;
+#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 */
 #define NIU_FLAGS_PROMISC              0x00100000 /* PROMISC enabled */
-#define NIU_FLAGS_VPD_VALID            0x00080000 /* VPD has valid version */
+#define NIU_FLAGS_XCVR_SERDES          0x00080000 /* 0=PHY 1=SERDES */
 #define NIU_FLAGS_10G                  0x00040000 /* 0=1G 1=10G */
 #define NIU_FLAGS_FIBER                        0x00020000 /* 0=COPPER 1=FIBER */
 #define NIU_FLAGS_XMAC                 0x00010000 /* 0=BMAC 1=XMAC */