From d2a1cec032d42392f2f43667877eda41fd67596e Mon Sep 17 00:00:00 2001
From: John Fastabend <john.r.fastabend@intel.com>
Date: Sat, 30 Oct 2010 14:22:37 +0000
Subject: [PATCH] --- yaml --- r: 224158 b: refs/heads/master c:
 8f5549f381ced6a255f2c7127b2b3b3b05fdfd6e h: refs/heads/master v: v3

---
 [refs]                     | 2 +-
 trunk/net/8021q/vlan_dev.c | 3 ---
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 5b841ae59352..c12e260106d5 100644
--- 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
index 14e3d1fa07a0..afb03c5a7adc 100644
--- 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);