Merge branch 'for-upstream' of git://openrisc.net/jonas/linux

[pandora-kernel.git] / drivers / net / bnx2x / bnx2x.h

diff --git a/drivers/net/bnx2x/bnx2x.h b/drivers/net/bnx2x/bnx2x.h
index 333f5d6..c423504 100644 (file)
--- a/drivers/net/bnx2x/bnx2x.h
+++ b/drivers/net/bnx2x/bnx2x.h
@@ -1104,7 +1104,7 @@ struct bnx2x {
 #define BP_VN(bp)                      (BP_E1HVN(bp)) /*remove when approved*/
 #define BP_L_ID(bp)                    (BP_E1HVN(bp) << 2)
 #define BP_FW_MB_IDX(bp)               (BP_PORT(bp) +\
-                                        BP_VN(bp) * (CHIP_IS_E1x(bp) ? 2  : 1))
+         BP_VN(bp) * ((CHIP_IS_E1x(bp) || (CHIP_MODE_IS_4_PORT(bp))) ? 2  : 1))
 
        struct net_device       *dev;
        struct pci_dev          *pdev;
@@ -1920,6 +1920,9 @@ static inline u32 reg_poll(struct bnx2x *bp, u32 reg, u32 expected, int ms,
                AEU_INPUTS_ATTN_BITS_MCP_LATCHED_UMP_TX_PARITY | \
                AEU_INPUTS_ATTN_BITS_MCP_LATCHED_SCPAD_PARITY)
 
+#define HW_PRTY_ASSERT_SET_4 (AEU_INPUTS_ATTN_BITS_PGLUE_PARITY_ERROR | \
+                             AEU_INPUTS_ATTN_BITS_ATC_PARITY_ERROR)
+
 #define RSS_FLAGS(bp) \
                (TSTORM_ETH_FUNCTION_COMMON_CONFIG_RSS_IPV4_CAPABILITY | \
                 TSTORM_ETH_FUNCTION_COMMON_CONFIG_RSS_IPV4_TCP_CAPABILITY | \