41 lines
1.5 KiB
Diff
41 lines
1.5 KiB
Diff
From b16dd2cff7a4eb3881f43371d71ed242332877dc Mon Sep 17 00:00:00 2001
|
|
From: Vasundhara Volam <vasundhara.volam@emulex.com>
|
|
Date: Thu, 17 Oct 2013 11:47:14 +0530
|
|
Subject: be2net: pass if_id for v1 and V2 versions of TX_CREATE cmd
|
|
|
|
From: Vasundhara Volam <vasundhara.volam@emulex.com>
|
|
|
|
[ Upstream commit 0fb88d61bc60779dde88b0fc268da17eb81d0412 ]
|
|
|
|
It is a required field for all TX_CREATE cmd versions > 0.
|
|
This fixes a driver initialization failure, caused by recent SH-R Firmwares
|
|
(versions > 10.0.639.0) failing the TX_CREATE cmd when if_id field is
|
|
not passed.
|
|
|
|
Signed-off-by: Sathya Perla <sathya.perla@emulex.com>
|
|
Signed-off-by: David S. Miller <davem@davemloft.net>
|
|
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
|
|
---
|
|
drivers/net/ethernet/emulex/benet/be_cmds.c | 3 ++-
|
|
1 file changed, 2 insertions(+), 1 deletion(-)
|
|
|
|
--- a/drivers/net/ethernet/emulex/benet/be_cmds.c
|
|
+++ b/drivers/net/ethernet/emulex/benet/be_cmds.c
|
|
@@ -1150,7 +1150,6 @@ int be_cmd_txq_create(struct be_adapter
|
|
|
|
if (lancer_chip(adapter)) {
|
|
req->hdr.version = 1;
|
|
- req->if_id = cpu_to_le16(adapter->if_handle);
|
|
} else if (BEx_chip(adapter)) {
|
|
if (adapter->function_caps & BE_FUNCTION_CAPS_SUPER_NIC)
|
|
req->hdr.version = 2;
|
|
@@ -1158,6 +1157,8 @@ int be_cmd_txq_create(struct be_adapter
|
|
req->hdr.version = 2;
|
|
}
|
|
|
|
+ if (req->hdr.version > 0)
|
|
+ req->if_id = cpu_to_le16(adapter->if_handle);
|
|
req->num_pages = PAGES_4K_SPANNED(q_mem->va, q_mem->size);
|
|
req->ulp_num = BE_ULP1_NUM;
|
|
req->type = BE_ETH_TX_RING_TYPE_STANDARD;
|