---

yaml --- r: 215524 b: refs/heads/master c: 0988c4c h: refs/heads/master v: v3
git-mirror · Oct 22, 2010 · a2a9e8e · a2a9e8e
1 parent 38ec20f
commit a2a9e8e
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2198a10b501fd4443430cb17e065a9e859cc58c9
+refs/heads/master: 0988c4c7fb5881377ec20a6452f739a722e97c6b
diff --git a/trunk/include/linux/if_vlan.h b/trunk/include/linux/if_vlan.h
@@ -168,7 +168,8 @@ static inline int __vlan_hwaccel_rx(struct sk_buff *skb, struct vlan_group *grp,
 
 static inline bool vlan_hwaccel_do_receive(struct sk_buff **skb)
 {
-	BUG();
+	if ((*skb)->vlan_tci & VLAN_VID_MASK)
+		(*skb)->pkt_type = PACKET_OTHERHOST;
 	return false;
 }