提交 efee8e87 编写于 作者: S Sarveshwar Bandi 提交者: David S. Miller

be2net: Avoid double insertion of vlan tags.

Fix to avoid double insertion of  vlan tags into the packet while
handling an asic workaroud (issue introduced by net next Commit bc0c3405)
Signed-off-by: NSarveshwar Bandi <sarveshwar.bandi@emulex.com>
Signed-off-by: NDavid S. Miller <davem@davemloft.net>
上级 950c54df
...@@ -780,26 +780,18 @@ static struct sk_buff *be_insert_vlan_in_pkt(struct be_adapter *adapter, ...@@ -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) vlan_tag = adapter->pvid;
skb->vlan_tci = 0;
}
if (qnq_async_evt_rcvd(adapter) && adapter->pvid) {
if (!vlan_tag)
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 */
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册