From: John Fastabend <john.r.fastabend@intel.com>
To: davem@davemloft.net
Cc: netdev@vger.kernel.org, jesse@nicira.com
Subject: [net-next-2.6 PATCH 2/3] net: remove check for headroom in vlan_dev_create
Date: Sat, 30 Oct 2010 17:22:37 -0700 [thread overview]
Message-ID: <20101031002237.8691.6266.stgit@jf-dev1-dcblab> (raw)
In-Reply-To: <20101031002232.8691.41201.stgit@jf-dev1-dcblab>
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(-)
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);
next prev parent reply other threads:[~2010-10-31 0:24 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-10-31 0:22 [net-next-2.6 PATCH 1/3] 8021q: set hard_header_len when VLAN offload features are toggled John Fastabend
2010-10-31 0:22 ` John Fastabend [this message]
2010-11-04 0:46 ` [net-next-2.6 PATCH 2/3] net: remove check for headroom in vlan_dev_create Jesse Gross
2010-11-15 18:12 ` David Miller
2010-10-31 0:22 ` [net-next-2.6 PATCH 3/3] net: consolidate 8021q tagging John Fastabend
2010-11-04 0:47 ` Jesse Gross
2010-11-15 18:12 ` David Miller
2010-11-04 0:46 ` [net-next-2.6 PATCH 1/3] 8021q: set hard_header_len when VLAN offload features are toggled Jesse Gross
2010-11-15 18:11 ` David Miller
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20101031002237.8691.6266.stgit@jf-dev1-dcblab \
--to=john.r.fastabend@intel.com \
--cc=davem@davemloft.net \
--cc=jesse@nicira.com \
--cc=netdev@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).