---

yaml --- r: 263220 b: refs/heads/master c: 32f7fd4 h: refs/heads/master v: v3
git-mirror · Aug 14, 2011 · 28e3665 · 28e3665
1 parent de5d4bb
commit 28e3665
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6a27cdeddf48858089e3672f844615cbf0877ebf
+refs/heads/master: 32f7fd44ce3aae9ad204fb167d793c335608568d
diff --git a/trunk/drivers/net/gianfar.c b/trunk/drivers/net/gianfar.c
@@ -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 */