[Acked] [Raring/Saucy][PATCH] be2net: pass if_id for v1 and V2 versions of TX_CREATE cmd

[Andy Whitcroft]

On Wed, Nov 06, 2013 at 11:45:46AM +0800, Wen-chien Jesse Sung wrote:
> From: Vasundhara Volam <vasundhara.volam at emulex.com>
> 
> BugLink: https://launchpad.net/bugs/1234019
> 
> 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 at emulex.com>
> Signed-off-by: David S. Miller <davem at davemloft.net>
> (cherry picked from commit 0fb88d61bc60779dde88b0fc268da17eb81d0412)
> Signed-off-by: Wen-chien Jesse Sung <jesse.sung at canonical.com>
> ---
>  drivers/net/ethernet/emulex/benet/be_cmds.c | 3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)
> 
> diff --git a/drivers/net/ethernet/emulex/benet/be_cmds.c b/drivers/net/ethernet/emulex/benet/be_cmds.c
> index 8ec5d74..13ac104 100644
> --- 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 *adapter, struct be_tx_obj *txo)
>  
>  	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 *adapter, struct be_tx_obj *txo)
>  		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;

Looks to do what is claimed.  Therefore:

Acked-by: Andy Whitcroft <apw at canonical.com>

-apw