be2net: Fix PVID tag offload for packets with inline VLAN tag.

PATCH New Ajit Khaparde 1 participant 1 message Apr 24, 2013

Subsystems (3)

Networking Network drivers Emulex 10Gbps NIC BE2, BE3-r, Lancer, Skyhawk-R driver (be2net)

lore

Share & tools

lore

Ajit Khaparde

author

2013-04-24 21:53 UTC #0 lore raw

PATCH 3/3 be2net: Fix PVID tag offload for packets with inline VLAN tag.

BE3 HW in UMC mode could wrongly double tag a packet with PVID when the packet already has a inlined VLAN tag.
In UMC mode, When HW finds that a packet is already VLAN tagged PVID should not be inserted into the packet.
To fix this use the FW hack to instruct the HW to skip PVID tagging.

Signed-off-by Ajit Khaparde <[email protected]>

---
 drivers/net/ethernet/emulex/benet/be_main.c |    8 ++++++++
 1 files changed, 8 insertions(+), 0 deletions(-)

drivers/net/ethernet/emulex/benet/be_main.c +8 -0

index 21109b5..1232e91 100644
@@ -834,6 +834,7 @@ static netdev_tx_t be_xmit(struct sk_buff *skb,
 	u32 start = txq->head, eth_hdr_len;
 	bool dummy_wrb, stopped = false;
 	bool skip_hw_vlan = false;
+	struct vlan_ethhdr *veh = (struct vlan_ethhdr *)skb->data;
 
 	eth_hdr_len = ntohs(skb->protocol) == ETH_P_8021Q ?
 		VLAN_ETH_HLEN : ETH_HLEN;

@@ -846,6 +847,13 @@ static netdev_tx_t be_xmit(struct sk_buff *skb,
 		pskb_trim(skb, eth_hdr_len + ntohs(ip->tot_len));
 	}
 
+	/* If vlan tag is already inlined in the packet, skip HW VLAN
+	 * tagging in UMC mode
+	 */
+	if ((adapter->function_mode & UMC_ENABLED) &&
+	    veh->h_vlan_proto == htons(ETH_P_8021Q))
+			skip_hw_vlan = true;
+
 	/* HW has a bug wherein it will calculate CSUM for VLAN
 	 * pkts even though it is disabled.
 	 * Manually insert VLAN in pkt.

Signature · 1 line

1.7.1