Pull sony-2.6.24 into release branch

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

diff --git a/drivers/net/s2io-regs.h b/drivers/net/s2io-regs.h
index 518e96d753719a1bbae9781aea13dadcdb8027d6..cfa267914476158a9cea058e203f3e5881f46925 100644 (file)
--- a/drivers/net/s2io-regs.h
+++ b/drivers/net/s2io-regs.h
@@ -1,6 +1,6 @@
 /************************************************************************
  * regs.h: A Linux PCI-X Ethernet driver for Neterion 10GbE Server NIC
- * Copyright(c) 2002-2005 Neterion Inc.
+ * Copyright(c) 2002-2007 Neterion Inc.
 
  * This software may be used and distributed according to the terms of
  * the GNU General Public License (GPL), incorporated herein by reference.
@@ -15,7 +15,7 @@
 
 #define TBD 0
 
-typedef struct _XENA_dev_config {
+struct XENA_dev_config {
 /* Convention: mHAL_XXX is mask, vHAL_XXX is value */
 
 /* General Control-Status Registers */
@@ -430,6 +430,7 @@ typedef struct _XENA_dev_config {
 #define TX_PA_CFG_IGNORE_SNAP_OUI          BIT(2)
 #define TX_PA_CFG_IGNORE_LLC_CTRL          BIT(3)
 #define        TX_PA_CFG_IGNORE_L2_ERR                    BIT(6)
+#define RX_PA_CFG_STRIP_VLAN_TAG               BIT(15)
 
 /* Recent add, used only debug purposes. */
        u64 pcc_enable;
@@ -746,10 +747,9 @@ typedef struct _XENA_dev_config {
 #define MC_ERR_REG_MIRI_CRI_ERR_1          BIT(23)
 #define MC_ERR_REG_SM_ERR                  BIT(31)
 #define MC_ERR_REG_ECC_ALL_SNG            (BIT(2) | BIT(3) | BIT(4) | BIT(5) |\
-                                           BIT(6) | BIT(7) | BIT(17) | BIT(19))
+                                       BIT(17) | BIT(19))
 #define MC_ERR_REG_ECC_ALL_DBL            (BIT(10) | BIT(11) | BIT(12) |\
-                                           BIT(13) | BIT(14) | BIT(15) |\
-                                           BIT(18) | BIT(20))
+                                       BIT(13) | BIT(18) | BIT(20))
        u64 mc_err_mask;
        u64 mc_err_alarm;
 
@@ -852,9 +852,9 @@ typedef struct _XENA_dev_config {
 #define SPI_CONTROL_DONE               BIT(6)
        u64 spi_data;
 #define SPI_DATA_WRITE(data,len)       vBIT(data,0,len)
-} XENA_dev_config_t;
+};
 
-#define XENA_REG_SPACE sizeof(XENA_dev_config_t)
+#define XENA_REG_SPACE sizeof(struct XENA_dev_config)
 #define        XENA_EEPROM_SPACE (0x01 << 11)
 
 #endif                         /* _REGS_H */