From: Phil Sutter <phil@nwl.cc>
To: "David S. Miller" <davem@davemloft.net>
Cc: netdev@vger.kernel.org
Subject: [PATCH v2 3/3] af_packet: simplify VLAN frame check in packet_snd
Date: Fri, 2 Aug 2013 11:37:41 +0200 [thread overview]
Message-ID: <1375436261-6746-3-git-send-email-phil@nwl.cc> (raw)
In-Reply-To: <1375436261-6746-2-git-send-email-phil@nwl.cc>
For ethernet frames, eth_type_trans() already parses the header, so one
can skip this when checking the frame size.
Signed-off-by: Phil Sutter <phil@nwl.cc>
---
net/packet/af_packet.c | 15 ++++-----------
1 file changed, 4 insertions(+), 11 deletions(-)
diff --git a/net/packet/af_packet.c b/net/packet/af_packet.c
index ce7b4f0..bbe1ece 100644
--- a/net/packet/af_packet.c
+++ b/net/packet/af_packet.c
@@ -2333,23 +2333,16 @@ static int packet_snd(struct socket *sock,
if (dev->type == ARPHRD_ETHER) {
skb->protocol = eth_type_trans(skb, dev);
+ if (skb->protocol == htons(ETH_P_8021Q))
+ reserve += VLAN_HLEN;
} else {
skb->protocol = proto;
skb->dev = dev;
}
if (!gso_type && (len > dev->mtu + reserve + extra_len)) {
- /* Earlier code assumed this would be a VLAN pkt,
- * double-check this now that we have the actual
- * packet in hand.
- */
- struct ethhdr *ehdr;
- skb_reset_mac_header(skb);
- ehdr = eth_hdr(skb);
- if (ehdr->h_proto != htons(ETH_P_8021Q)) {
- err = -EMSGSIZE;
- goto out_free;
- }
+ err = -EMSGSIZE;
+ goto out_free;
}
skb->priority = sk->sk_priority;
--
1.8.1.5
next prev parent reply other threads:[~2013-08-02 9:38 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-07-29 16:53 packet_mmap, 802.1Q and bridges Phil Sutter
2013-07-31 17:27 ` Parse ethernet headers in af_packet.c Phil Sutter
2013-07-31 17:27 ` [PATCH 1/3] af_packet: when sending ethernet frames, parse header for skb->protocol Phil Sutter
2013-07-31 17:27 ` [PATCH 2/3] af_packet: fix for sending VLAN frames via packet_mmap Phil Sutter
2013-07-31 17:27 ` [PATCH 3/3] af_packet: simplify VLAN frame check in packet_snd Phil Sutter
2013-08-01 0:30 ` [PATCH 1/3] af_packet: when sending ethernet frames, parse header for skb->protocol David Miller
2013-08-01 10:35 ` Phil Sutter
2013-08-02 1:12 ` David Miller
2013-08-02 9:37 ` [PATCH v2 " Phil Sutter
2013-08-02 9:37 ` [PATCH v2 2/3] af_packet: fix for sending VLAN frames via packet_mmap Phil Sutter
2013-08-02 9:37 ` Phil Sutter [this message]
2013-08-02 21:59 ` [PATCH v2 3/3] af_packet: simplify VLAN frame check in packet_snd David Miller
2013-08-02 21:58 ` [PATCH v2 2/3] af_packet: fix for sending VLAN frames via packet_mmap David Miller
2013-08-02 21:58 ` [PATCH v2 1/3] af_packet: when sending ethernet frames, parse header for skb->protocol 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=1375436261-6746-3-git-send-email-phil@nwl.cc \
--to=phil@nwl.cc \
--cc=davem@davemloft.net \
--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).