diff options
| author | John Fastabend <john.r.fastabend@intel.com> | 2010-10-30 16:22:37 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-11-15 19:11:40 +0100 |
| commit | 8f5549f381ced6a255f2c7127b2b3b3b05fdfd6e (patch) | |
| tree | 495c1ed3e1031a8f07b659cf3772ed2be22ea9d3 /net/8021q/vlan_dev.c | |
| parent | 8021q: set hard_header_len when VLAN offload features are toggled (diff) | |
| download | linux-8f5549f381ced6a255f2c7127b2b3b3b05fdfd6e.tar.xz linux-8f5549f381ced6a255f2c7127b2b3b3b05fdfd6e.zip | |
net: remove check for headroom in vlan_dev_create
It is possible for the headroom to be smaller then the
hard_header_len for a short period of time after toggling
the vlan offload setting.
This is not a hard error and skb_cow_head is called in
__vlan_put_tag() to resolve this.
Signed-off-by: John Fastabend <john.r.fastabend@intel.com>
Acked-by: Jesse Gross <jesse@nicira.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/8021q/vlan_dev.c')
| -rw-r--r-- | net/8021q/vlan_dev.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/net/8021q/vlan_dev.c b/net/8021q/vlan_dev.c index 14e3d1fa07a0..afb03c5a7adc 100644 --- a/net/8021q/vlan_dev.c +++ b/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); |