Message ID | 1381311252-23263-1-git-send-email-jesse.sung@canonical.com |
---|---|
State | New |
Headers | show |
On 10/09/2013 02:34 AM, Wen-chien Jesse Sung wrote: > From: Vasundhara Volam <vasundhara.volam@emulex.com> > > BugLink: https://launchpad.net/bugs/1234019 > > It is a required field for all TX_CREATE cmd versions > 0. > Signed-off-by: Vasundhara Volam <vasundhara.volam@emulex.com> > Signed-off-by: Sathya Perla <sathya.perla@emulex.com> > Signed-off-by: David S. Miller <davem@davemloft.net> > (cherry picked from commit 81b0265531b2ff091fb91c0af9bc9675f84e6f56) > > Signed-off-by: Wen-chien Jesse Sung <jesse.sung@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; >
This ought to be in stable as well.
I really did apply this patch.
Tim Gardner <tim.gardner@canonical.com> writes:
> This ought to be in stable as well.
Since this commit hasn't hit mainline yet (looks like it's in
net-next), I'm not queuing it to the 3.5 kernel for the moment. I'll
wait for David Miller to send it to the stable mailing list.
Cheers,
On 10/09/2013 10:13 AM, Luis Henriques wrote: > Tim Gardner <tim.gardner@canonical.com> writes: > >> This ought to be in stable as well. > > Since this commit hasn't hit mainline yet (looks like it's in > net-next), I'm not queuing it to the 3.5 kernel for the moment. I'll > wait for David Miller to send it to the stable mailing list. > > Cheers, > Grr. I'm dropping this patch. You Canonical peeps (i.e. Jesse) should know by now what our patch acceptence criteria and format are. I don't really _want_ to have to check everything you send me to make sure the commit log is actually accurate. rtg
2013/10/10 Tim Gardner <tim.gardner@canonical.com>: > Grr. I'm dropping this patch. You Canonical peeps (i.e. Jesse) should > know by now what our patch acceptence criteria and format are. I don't > really _want_ to have to check everything you send me to make sure the > commit log is actually accurate. Sorry, will be more careful of this. Thanks, Jesse
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;