aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPadmanabh Ratnakar <padmanabh.ratnakar@emulex.com>2011-03-06 22:08:52 -0500
committerDavid S. Miller <davem@davemloft.net>2011-03-07 18:26:57 -0500
commit8b7756ca52b11225395a9fadf9ed200f03983b46 (patch)
treed9e28f1112ba863ddc975592994790f5e08ee023
parent37eed1cbbd446dc2808e1bff717010aa978fc0de (diff)
be2net: Change f/w command versions for Lancer
Change f/w command versions for Lancer Signed-off-by: Padmanabh Ratnakar <padmanabh.ratnakar@emulex.com> Signed-off-by: Sathya Perla <sathya.perla@emulex.com> Signed-off-by: Subramanian Seetharaman <subbu.seetharaman@emulex.com> Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--drivers/net/benet/be_cmds.c8
-rw-r--r--drivers/net/benet/be_cmds.h2
2 files changed, 8 insertions, 2 deletions
diff --git a/drivers/net/benet/be_cmds.c b/drivers/net/benet/be_cmds.c
index 1822ecdadc7..cc3a235475b 100644
--- a/drivers/net/benet/be_cmds.c
+++ b/drivers/net/benet/be_cmds.c
@@ -726,7 +726,7 @@ int be_cmd_cq_create(struct be_adapter *adapter,
726 726
727 req->num_pages = cpu_to_le16(PAGES_4K_SPANNED(q_mem->va, q_mem->size)); 727 req->num_pages = cpu_to_le16(PAGES_4K_SPANNED(q_mem->va, q_mem->size));
728 if (lancer_chip(adapter)) { 728 if (lancer_chip(adapter)) {
729 req->hdr.version = 1; 729 req->hdr.version = 2;
730 req->page_size = 1; /* 1 for 4K */ 730 req->page_size = 1; /* 1 for 4K */
731 AMAP_SET_BITS(struct amap_cq_context_lancer, coalescwm, ctxt, 731 AMAP_SET_BITS(struct amap_cq_context_lancer, coalescwm, ctxt,
732 coalesce_wm); 732 coalesce_wm);
@@ -862,6 +862,12 @@ int be_cmd_txq_create(struct be_adapter *adapter,
862 be_cmd_hdr_prepare(&req->hdr, CMD_SUBSYSTEM_ETH, OPCODE_ETH_TX_CREATE, 862 be_cmd_hdr_prepare(&req->hdr, CMD_SUBSYSTEM_ETH, OPCODE_ETH_TX_CREATE,
863 sizeof(*req)); 863 sizeof(*req));
864 864
865 if (lancer_chip(adapter)) {
866 req->hdr.version = 1;
867 AMAP_SET_BITS(struct amap_tx_context, if_id, ctxt,
868 adapter->if_handle);
869 }
870
865 req->num_pages = PAGES_4K_SPANNED(q_mem->va, q_mem->size); 871 req->num_pages = PAGES_4K_SPANNED(q_mem->va, q_mem->size);
866 req->ulp_num = BE_ULP1_NUM; 872 req->ulp_num = BE_ULP1_NUM;
867 req->type = BE_ETH_TX_RING_TYPE_STANDARD; 873 req->type = BE_ETH_TX_RING_TYPE_STANDARD;
diff --git a/drivers/net/benet/be_cmds.h b/drivers/net/benet/be_cmds.h
index 93e5768fc70..5bdaa22dee8 100644
--- a/drivers/net/benet/be_cmds.h
+++ b/drivers/net/benet/be_cmds.h
@@ -430,7 +430,7 @@ struct be_cmd_resp_mcc_create {
430/* Pseudo amap definition in which each bit of the actual structure is defined 430/* Pseudo amap definition in which each bit of the actual structure is defined
431 * as a byte: used to calculate offset/shift/mask of each field */ 431 * as a byte: used to calculate offset/shift/mask of each field */
432struct amap_tx_context { 432struct amap_tx_context {
433 u8 rsvd0[16]; /* dword 0 */ 433 u8 if_id[16]; /* dword 0 */
434 u8 tx_ring_size[4]; /* dword 0 */ 434 u8 tx_ring_size[4]; /* dword 0 */
435 u8 rsvd1[26]; /* dword 0 */ 435 u8 rsvd1[26]; /* dword 0 */
436 u8 pci_func_id[8]; /* dword 1 */ 436 u8 pci_func_id[8]; /* dword 1 */