* [PATCH net] be2net: Fix to avoid hardware workaround when not needed
@ 2013-07-16 7:14 sarveshwar.bandi
2013-07-16 20:03 ` David Miller
0 siblings, 1 reply; 5+ messages in thread
From: sarveshwar.bandi @ 2013-07-16 7:14 UTC (permalink / raw)
To: davem; +Cc: netdev, Sarveshwar Bandi
From: Sarveshwar Bandi <sarveshwar.bandi@emulex.com>
Hardware workaround requesting hardware to skip vlan insertion is necessary
only when umc or qnq is enabled. Enabling this workaround in other scenarios
could cause controller to stall.
Signed-off-by: Sarveshwar Bandi <sarveshwar.bandi@emulex.com>
---
drivers/net/ethernet/emulex/benet/be_main.c | 14 ++++++++++----
1 file changed, 10 insertions(+), 4 deletions(-)
diff --git a/drivers/net/ethernet/emulex/benet/be_main.c b/drivers/net/ethernet/emulex/benet/be_main.c
index 2df48bb..181edb5 100644
--- a/drivers/net/ethernet/emulex/benet/be_main.c
+++ b/drivers/net/ethernet/emulex/benet/be_main.c
@@ -782,16 +782,22 @@ static struct sk_buff *be_insert_vlan_in_pkt(struct be_adapter *adapter,
if (vlan_tx_tag_present(skb))
vlan_tag = be_get_tx_vlan_tag(adapter, skb);
- else if (qnq_async_evt_rcvd(adapter) && adapter->pvid)
- vlan_tag = adapter->pvid;
+
+ if (qnq_async_evt_rcvd(adapter) && adapter->pvid) {
+ if (!vlan_tag)
+ vlan_tag = adapter->pvid;
+ /* f/w workaround to set skip_hw_vlan = 1, informs the F/W to
+ * skip VLAN insertion
+ */
+ if (skip_hw_vlan)
+ *skip_hw_vlan = true;
+ }
if (vlan_tag) {
skb = __vlan_put_tag(skb, htons(ETH_P_8021Q), vlan_tag);
if (unlikely(!skb))
return skb;
skb->vlan_tci = 0;
- if (skip_hw_vlan)
- *skip_hw_vlan = true;
}
/* Insert the outer VLAN, if any */
--
1.7.9.5
^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [PATCH net] be2net: Fix to avoid hardware workaround when not needed
2013-07-16 7:14 [PATCH net] be2net: Fix to avoid hardware workaround when not needed sarveshwar.bandi
@ 2013-07-16 20:03 ` David Miller
2013-07-17 3:03 ` Bandi, Sarveshwar
0 siblings, 1 reply; 5+ messages in thread
From: David Miller @ 2013-07-16 20:03 UTC (permalink / raw)
To: sarveshwar.bandi; +Cc: netdev
From: <sarveshwar.bandi@emulex.com>
Date: Tue, 16 Jul 2013 12:44:02 +0530
> From: Sarveshwar Bandi <sarveshwar.bandi@emulex.com>
>
> Hardware workaround requesting hardware to skip vlan insertion is necessary
> only when umc or qnq is enabled. Enabling this workaround in other scenarios
> could cause controller to stall.
>
> Signed-off-by: Sarveshwar Bandi <sarveshwar.bandi@emulex.com>
Applied.
^ permalink raw reply [flat|nested] 5+ messages in thread
* RE: [PATCH net] be2net: Fix to avoid hardware workaround when not needed
2013-07-16 20:03 ` David Miller
@ 2013-07-17 3:03 ` Bandi, Sarveshwar
2013-07-17 5:01 ` David Miller
0 siblings, 1 reply; 5+ messages in thread
From: Bandi, Sarveshwar @ 2013-07-17 3:03 UTC (permalink / raw)
To: David Miller; +Cc: netdev
Dave,
Please queue up this patch for 3.10 stable.
Thanks,
Sarvesh
-----Original Message-----
From: David Miller [mailto:davem@davemloft.net]
Sent: Wednesday, July 17, 2013 1:34 AM
To: Bandi, Sarveshwar
Cc: netdev@vger.kernel.org
Subject: Re: [PATCH net] be2net: Fix to avoid hardware workaround when not needed
From: <sarveshwar.bandi@emulex.com>
Date: Tue, 16 Jul 2013 12:44:02 +0530
> From: Sarveshwar Bandi <sarveshwar.bandi@emulex.com>
>
> Hardware workaround requesting hardware to skip vlan insertion is
> necessary only when umc or qnq is enabled. Enabling this workaround in
> other scenarios could cause controller to stall.
>
> Signed-off-by: Sarveshwar Bandi <sarveshwar.bandi@emulex.com>
Applied.
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH net] be2net: Fix to avoid hardware workaround when not needed
2013-07-17 3:03 ` Bandi, Sarveshwar
@ 2013-07-17 5:01 ` David Miller
2013-07-17 16:01 ` Rick Jones
0 siblings, 1 reply; 5+ messages in thread
From: David Miller @ 2013-07-17 5:01 UTC (permalink / raw)
To: Sarveshwar.Bandi; +Cc: netdev
From: "Bandi, Sarveshwar" <Sarveshwar.Bandi@Emulex.Com>
Date: Wed, 17 Jul 2013 03:03:52 +0000
> Please queue up this patch for 3.10 stable.
Done.
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH net] be2net: Fix to avoid hardware workaround when not needed
2013-07-17 5:01 ` David Miller
@ 2013-07-17 16:01 ` Rick Jones
0 siblings, 0 replies; 5+ messages in thread
From: Rick Jones @ 2013-07-17 16:01 UTC (permalink / raw)
To: David Miller; +Cc: Sarveshwar.Bandi, netdev
On 07/16/2013 10:01 PM, David Miller wrote:
> From: "Bandi, Sarveshwar" <Sarveshwar.Bandi@Emulex.Com>
> Date: Wed, 17 Jul 2013 03:03:52 +0000
>
>> Please queue up this patch for 3.10 stable.
>
> Done.
Huzzah! (I was hitting this bug...)
rick jones
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2013-07-17 16:01 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2013-07-16 7:14 [PATCH net] be2net: Fix to avoid hardware workaround when not needed sarveshwar.bandi
2013-07-16 20:03 ` David Miller
2013-07-17 3:03 ` Bandi, Sarveshwar
2013-07-17 5:01 ` David Miller
2013-07-17 16:01 ` Rick Jones
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.