---

yaml --- r: 224158 b: refs/heads/master c: 8f5549f h: refs/heads/master v: v3
git-mirror · Nov 15, 2010 · d2a1cec · d2a1cec
1 parent d1b0812
commit d2a1cec
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 4 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 029f5fc31cdb35d6c8a7fe9a54bf21556e175988
+refs/heads/master: 8f5549f381ced6a255f2c7127b2b3b3b05fdfd6e
diff --git a/trunk/net/8021q/vlan_dev.c b/trunk/net/8021q/vlan_dev.c
@@ -274,9 +274,6 @@ static int vlan_dev_hard_header(struct sk_buff *skb, struct net_device *dev,
 	u16 vlan_tci = 0;
 	int rc;
 
-	if (WARN_ON(skb_headroom(skb) < dev->hard_header_len))
-		return -ENOSPC;
-
 	if (!(vlan_dev_info(dev)->flags & VLAN_FLAG_REORDER_HDR)) {
 		vhdr = (struct vlan_hdr *) skb_push(skb, VLAN_HLEN);