Staging: Merge staging-next into Linus's tree

[sfrench/cifs-2.6.git] / drivers / net / benet / be_hw.h

diff --git a/drivers/net/benet/be_hw.h b/drivers/net/benet/be_hw.h
index 063026de49571ae638dad9f604175bfd51ddfebf..5d38046402b235d255b529bb96c3cd07806fe3a9 100644 (file)
--- a/drivers/net/benet/be_hw.h
+++ b/drivers/net/benet/be_hw.h
@@ -52,10 +52,20 @@
  */
 #define MEMBAR_CTRL_INT_CTRL_HOSTINTR_MASK     (1 << 29) /* bit 29 */
 
-/********* Power managment (WOL) **********/
+/********* Power management (WOL) **********/
 #define PCICFG_PM_CONTROL_OFFSET               0x44
 #define PCICFG_PM_CONTROL_MASK                 0x108   /* bits 3 & 8 */
 
+/********* Online Control Registers *******/
+#define PCICFG_ONLINE0                         0xB0
+#define PCICFG_ONLINE1                         0xB4
+
+/********* UE Status and Mask Registers ***/
+#define PCICFG_UE_STATUS_LOW                   0xA0
+#define PCICFG_UE_STATUS_HIGH                  0xA4
+#define PCICFG_UE_STATUS_LOW_MASK              0xA8
+#define PCICFG_UE_STATUS_HI_MASK               0xAC
+
 /********* ISR0 Register offset **********/
 #define CEV_ISR0_OFFSET                        0xC18
 #define CEV_ISR_SIZE                           4
@@ -192,7 +202,7 @@ struct amap_eth_hdr_wrb {
        u8 event;
        u8 crc;
        u8 forward;
-       u8 ipsec;
+       u8 lso6;
        u8 mgmt;
        u8 ipcs;
        u8 udpcs;