diff options
| author | Vlad Zolotarov <vladz@broadcom.com> | 2011-06-14 15:33:44 +0400 |
|---|---|---|
| committer | David S. Miller <davem@conan.davemloft.net> | 2011-06-15 18:56:37 +0400 |
| commit | 619c5cb6885b936c44ae1422ef805b69c6291485 (patch) | |
| tree | 4604ae08f1eb12c6ad1f65106879c2e73946ae12 /drivers/net/cnic_if.h | |
| parent | 042181f5aa8833a8918e1a91cfaf292146ffc62c (diff) | |
| download | linux-619c5cb6885b936c44ae1422ef805b69c6291485.tar.xz | |
New 7.0 FW: bnx2x, cnic, bnx2i, bnx2fc
New FW/HSI (7.0):
- Added support to 578xx chips
- Improved HSI - much less driver's direct access to the FW internal
memory needed.
New implementation of the HSI handling layer in the bnx2x (bnx2x_sp.c):
- Introduced chip dependent objects that have chip independent interfaces
for configuration of MACs, multicast addresses, Rx mode, indirection table,
fast path queues and function initialization/cleanup.
- Objects functionality is based on the private function pointers, which
allows not only a per-chip but also PF/VF differentiation while still
preserving the same interface towards the driver.
- Objects interface is not influenced by the HSI changes which do not require
providing new parameters keeping the code outside the bnx2x_sp.c invariant
with regard to such HSI chnages.
Changes in a CNIC, bnx2fc and bnx2i modules due to the new HSI.
Signed-off-by: Vladislav Zolotarov <vladz@broadcom.com>
Signed-off-by: Michael Chan <mchan@broadcom.com>
Signed-off-by: Bhanu Prakash Gollapudi <bprakash@broadcom.com>
Signed-off-by: Eilon Greenstein <eilong@broadcom.com>
Signed-off-by: David S. Miller <davem@conan.davemloft.net>
Diffstat (limited to 'drivers/net/cnic_if.h')
| -rw-r--r-- | drivers/net/cnic_if.h | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/drivers/net/cnic_if.h b/drivers/net/cnic_if.h index fdd8e46a9050..bc7000a2d4e1 100644 --- a/drivers/net/cnic_if.h +++ b/drivers/net/cnic_if.h @@ -12,8 +12,8 @@ #ifndef CNIC_IF_H #define CNIC_IF_H -#define CNIC_MODULE_VERSION "2.2.14" -#define CNIC_MODULE_RELDATE "Mar 30, 2011" +#define CNIC_MODULE_VERSION "2.5.3" +#define CNIC_MODULE_RELDATE "June 6, 2011" #define CNIC_ULP_RDMA 0 #define CNIC_ULP_ISCSI 1 @@ -99,6 +99,8 @@ struct kcqe { struct cnic_ctl_completion { u32 cid; + u8 opcode; + u8 error; }; struct cnic_ctl_info { @@ -169,7 +171,7 @@ struct cnic_eth_dev { struct pci_dev *pdev; void __iomem *io_base; void __iomem *io_base2; - void *iro_arr; + const void *iro_arr; u32 ctx_tbl_offset; u32 ctx_tbl_len; |