lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

be2net: Avoid double insertion of vlan tags.

Browse Source 
Fix to avoid double insertion of  vlan tags into the packet while
handling an asic workaroud (issue introduced by net next Commit bc0c340)

Signed-off-by: Sarveshwar Bandi <sarveshwar.bandi@emulex.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Sarveshwar Bandi
2013-05-13 20:28:20 +00:00
committed by David S. Miller
parent 950c54df1e
commit efee8e8712
1 changed files with 5 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
drivers/net/ethernet/emulex/benet/be_main.c
View File

@@ -780,26 +780,18 @@ static struct sk_buff *be_insert_vlan_in_pkt(struct be_adapter *adapter,
if (unlikely(!skb)) if (unlikely(!skb))
return skb; return skb;
if (vlan_tx_tag_present(skb)) { if (vlan_tx_tag_present(skb))
vlan_tag = be_get_tx_vlan_tag(adapter, skb); vlan_tag = be_get_tx_vlan_tag(adapter, skb);
skb = __vlan_put_tag(skb, htons(ETH_P_8021Q), vlan_tag); else if (qnq_async_evt_rcvd(adapter) && adapter->pvid)
if (skb)
skb->vlan_tci = 0;
}
if (qnq_async_evt_rcvd(adapter) && adapter->pvid) {
if (!vlan_tag)
vlan_tag = adapter->pvid; vlan_tag = adapter->pvid;
if (skip_hw_vlan)
*skip_hw_vlan = true;
}
if (vlan_tag) { if (vlan_tag) {
skb = __vlan_put_tag(skb, htons(ETH_P_8021Q), vlan_tag); skb = __vlan_put_tag(skb, htons(ETH_P_8021Q), vlan_tag);
if (unlikely(!skb)) if (unlikely(!skb))
return skb; return skb;
skb->vlan_tci = 0; skb->vlan_tci = 0;
if (skip_hw_vlan)
*skip_hw_vlan = true;
} }
/* Insert the outer VLAN, if any */ /* Insert the outer VLAN, if any */