| Message ID | 20101031002237.8691.6266.stgit@jf-dev1-dcblab |
|---|---|
| State | Accepted, archived |
| Delegated to: | David Miller |
| Headers | show |
On Sat, Oct 30, 2010 at 5:22 PM, John Fastabend <john.r.fastabend@intel.com> wrote: > 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> -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
From: John Fastabend <john.r.fastabend@intel.com> Date: Sat, 30 Oct 2010 17:22:37 -0700 > 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> Applied. -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/net/8021q/vlan_dev.c b/net/8021q/vlan_dev.c index 14e3d1f..afb03c5 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);
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> --- net/8021q/vlan_dev.c | 3 --- 1 files changed, 0 insertions(+), 3 deletions(-) -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html