aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Chan <mchan@broadcom.com>2012-02-20 04:59:10 -0500
committerDavid S. Miller <davem@davemloft.net>2012-02-20 19:34:08 -0500
commite65de0716f4fb72b09fb37f603b71f4eabe18322 (patch)
treeb06d099ff67b6d4f8a17f06bd523b5885a5cbee1
parent1101a0d87a8e336914d2f31b528748a231c375ed (diff)
cnic: update for FW 7.2.xx
Signed-off-by: Michael Chan <mchan@broadcom.com> Signed-off-by: Dmitry Kravkov <dmitry@broadcom.com> Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--drivers/net/ethernet/broadcom/cnic_defs.h24
1 files changed, 12 insertions, 12 deletions
diff --git a/drivers/net/ethernet/broadcom/cnic_defs.h b/drivers/net/ethernet/broadcom/cnic_defs.h
index 7271f14bda3b..06ca00266d70 100644
--- a/drivers/net/ethernet/broadcom/cnic_defs.h
+++ b/drivers/net/ethernet/broadcom/cnic_defs.h
@@ -1393,9 +1393,9 @@ struct xstorm_fcoe_extra_ag_context_section {
1393#define __XSTORM_FCOE_EXTRA_AG_CONTEXT_SECTION_RESERVED_DA_EXPIRATION_FLAG_SHIFT 7 1393#define __XSTORM_FCOE_EXTRA_AG_CONTEXT_SECTION_RESERVED_DA_EXPIRATION_FLAG_SHIFT 7
1394#endif 1394#endif
1395 u32 snd_nxt; 1395 u32 snd_nxt;
1396 u32 tx_wnd; 1396 u32 __xfrqe_bd_addr_lo;
1397 u32 __reserved55; 1397 u32 __xfrqe_bd_addr_hi;
1398 u32 local_adv_wnd; 1398 u32 __xfrqe_data1;
1399#if defined(__BIG_ENDIAN) 1399#if defined(__BIG_ENDIAN)
1400 u8 __agg_val8_th; 1400 u8 __agg_val8_th;
1401 u8 __tx_dest; 1401 u8 __tx_dest;
@@ -1481,13 +1481,13 @@ struct xstorm_fcoe_extra_ag_context_section {
1481#endif 1481#endif
1482 u32 __tcp_agg_vars6; 1482 u32 __tcp_agg_vars6;
1483#if defined(__BIG_ENDIAN) 1483#if defined(__BIG_ENDIAN)
1484 u16 __agg_misc6; 1484 u16 __xfrqe_mng;
1485 u16 __tcp_agg_vars7; 1485 u16 __tcp_agg_vars7;
1486#elif defined(__LITTLE_ENDIAN) 1486#elif defined(__LITTLE_ENDIAN)
1487 u16 __tcp_agg_vars7; 1487 u16 __tcp_agg_vars7;
1488 u16 __agg_misc6; 1488 u16 __xfrqe_mng;
1489#endif 1489#endif
1490 u32 __agg_val10; 1490 u32 __xfrqe_data0;
1491 u32 __agg_val10_th; 1491 u32 __agg_val10_th;
1492#if defined(__BIG_ENDIAN) 1492#if defined(__BIG_ENDIAN)
1493 u16 __reserved3; 1493 u16 __reserved3;
@@ -1707,11 +1707,11 @@ struct xstorm_fcoe_ag_context {
1707#define XSTORM_FCOE_AG_CONTEXT_AGG_MISC3 (0xFF<<24) 1707#define XSTORM_FCOE_AG_CONTEXT_AGG_MISC3 (0xFF<<24)
1708#define XSTORM_FCOE_AG_CONTEXT_AGG_MISC3_SHIFT 24 1708#define XSTORM_FCOE_AG_CONTEXT_AGG_MISC3_SHIFT 24
1709#if defined(__BIG_ENDIAN) 1709#if defined(__BIG_ENDIAN)
1710 u16 agg_misc0; 1710 u16 __cache_wqe_db;
1711 u16 sq_prod; 1711 u16 sq_prod;
1712#elif defined(__LITTLE_ENDIAN) 1712#elif defined(__LITTLE_ENDIAN)
1713 u16 sq_prod; 1713 u16 sq_prod;
1714 u16 agg_misc0; 1714 u16 __cache_wqe_db;
1715#endif 1715#endif
1716#if defined(__BIG_ENDIAN) 1716#if defined(__BIG_ENDIAN)
1717 u8 agg_val3; 1717 u8 agg_val3;
@@ -3017,8 +3017,8 @@ struct fcoe_tce_tx_wr_rx_rd_const {
3017#define FCOE_TCE_TX_WR_RX_RD_CONST_RSRV1_SHIFT 5 3017#define FCOE_TCE_TX_WR_RX_RD_CONST_RSRV1_SHIFT 5
3018#define FCOE_TCE_TX_WR_RX_RD_CONST_TX_SEQ_INIT (0x1<<6) 3018#define FCOE_TCE_TX_WR_RX_RD_CONST_TX_SEQ_INIT (0x1<<6)
3019#define FCOE_TCE_TX_WR_RX_RD_CONST_TX_SEQ_INIT_SHIFT 6 3019#define FCOE_TCE_TX_WR_RX_RD_CONST_TX_SEQ_INIT_SHIFT 6
3020#define FCOE_TCE_TX_WR_RX_RD_CONST_RSRV2 (0x1<<7) 3020#define FCOE_TCE_TX_WR_RX_RD_CONST_TX_COMP_TRNS (0x1<<7)
3021#define FCOE_TCE_TX_WR_RX_RD_CONST_RSRV2_SHIFT 7 3021#define FCOE_TCE_TX_WR_RX_RD_CONST_TX_COMP_TRNS_SHIFT 7
3022 __le16 rsrv3; 3022 __le16 rsrv3;
3023 __le32 verify_tx_seq; 3023 __le32 verify_tx_seq;
3024}; 3024};
@@ -4299,7 +4299,7 @@ struct xstorm_eth_context_section {
4299#endif 4299#endif
4300#if defined(__BIG_ENDIAN) 4300#if defined(__BIG_ENDIAN)
4301 u16 reserved_vlan_type; 4301 u16 reserved_vlan_type;
4302 u16 params; 4302 u16 vlan_params;
4303#define XSTORM_ETH_CONTEXT_SECTION_VLAN_ID (0xFFF<<0) 4303#define XSTORM_ETH_CONTEXT_SECTION_VLAN_ID (0xFFF<<0)
4304#define XSTORM_ETH_CONTEXT_SECTION_VLAN_ID_SHIFT 0 4304#define XSTORM_ETH_CONTEXT_SECTION_VLAN_ID_SHIFT 0
4305#define XSTORM_ETH_CONTEXT_SECTION_CFI (0x1<<12) 4305#define XSTORM_ETH_CONTEXT_SECTION_CFI (0x1<<12)
@@ -4307,7 +4307,7 @@ struct xstorm_eth_context_section {
4307#define XSTORM_ETH_CONTEXT_SECTION_PRIORITY (0x7<<13) 4307#define XSTORM_ETH_CONTEXT_SECTION_PRIORITY (0x7<<13)
4308#define XSTORM_ETH_CONTEXT_SECTION_PRIORITY_SHIFT 13 4308#define XSTORM_ETH_CONTEXT_SECTION_PRIORITY_SHIFT 13
4309#elif defined(__LITTLE_ENDIAN) 4309#elif defined(__LITTLE_ENDIAN)
4310 u16 params; 4310 u16 vlan_params;
4311#define XSTORM_ETH_CONTEXT_SECTION_VLAN_ID (0xFFF<<0) 4311#define XSTORM_ETH_CONTEXT_SECTION_VLAN_ID (0xFFF<<0)
4312#define XSTORM_ETH_CONTEXT_SECTION_VLAN_ID_SHIFT 0 4312#define XSTORM_ETH_CONTEXT_SECTION_VLAN_ID_SHIFT 0
4313#define XSTORM_ETH_CONTEXT_SECTION_CFI (0x1<<12) 4313#define XSTORM_ETH_CONTEXT_SECTION_CFI (0x1<<12)