Commit 32f7fd44 authored by Jiri Pirko's avatar Jiri Pirko Committed by David S. Miller
Browse files

gianfar: prevent buggy hw rx vlan tagging 



On some buggy chips, "vlan tag present" flag is set which causes packet
loss. Fix this by checking if rx vlan accel is enabled in features.

Reported-by: default avatarMichael Guntsche <mguntsche@gmail.com>
Signed-off-by: default avatarJiri Pirko <jpirko@redhat.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 6a27cded

drivers/net/gianfar.c

+7 −2
Original line number Diff line number Diff line
@@ -2710,8 +2710,13 @@ static int gfar_process_frame(struct net_device *dev, struct sk_buff *skb, 
	/* Tell the skb what kind of packet this is */

	skb->protocol = eth_type_trans(skb, dev);



	/* Set vlan tag */

	if (fcb->flags & RXFCB_VLN)

	/*

	 * There's need to check for NETIF_F_HW_VLAN_RX here.

	 * Even if vlan rx accel is disabled, on some chips

	 * RXFCB_VLN is pseudo randomly set.

	 */

	if (dev->features & NETIF_F_HW_VLAN_RX &&

	    fcb->flags & RXFCB_VLN)

		__vlan_hwaccel_put_tag(skb, fcb->vlctl);



	/* Send the packet up the stack */