From: Pablo Neira Ayuso <pablo@netfilter.org>
To: netfilter-devel@vger.kernel.org
Cc: davem@davemloft.net, netdev@vger.kernel.org
Subject: [PATCH 11/12] netfilter: bridge: refactor conditional in br_nf_dev_queue_xmit
Date: Mon, 9 Mar 2015 18:14:34 +0100 [thread overview]
Message-ID: <1425921275-9171-12-git-send-email-pablo@netfilter.org> (raw)
In-Reply-To: <1425921275-9171-1-git-send-email-pablo@netfilter.org>
From: Florian Westphal <fw@strlen.de>
simpilifies followup patch that re-works brnf ip_fragment handling.
Signed-off-by: Florian Westphal <fw@strlen.de>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
---
net/bridge/br_netfilter.c | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
diff --git a/net/bridge/br_netfilter.c b/net/bridge/br_netfilter.c
index 5b3bceb..ef1fe28 100644
--- a/net/bridge/br_netfilter.c
+++ b/net/bridge/br_netfilter.c
@@ -803,13 +803,16 @@ static int br_nf_dev_queue_xmit(struct sk_buff *skb)
{
int ret;
int frag_max_size;
+ unsigned int mtu_reserved;
+ if (skb_is_gso(skb) || skb->protocol != htons(ETH_P_IP))
+ return br_dev_queue_push_xmit(skb);
+
+ mtu_reserved = nf_bridge_mtu_reduction(skb);
/* This is wrong! We should preserve the original fragment
* boundaries by preserving frag_list rather than refragmenting.
*/
- if (skb->protocol == htons(ETH_P_IP) &&
- skb->len + nf_bridge_mtu_reduction(skb) > skb->dev->mtu &&
- !skb_is_gso(skb)) {
+ if (skb->len + mtu_reserved > skb->dev->mtu) {
frag_max_size = BR_INPUT_SKB_CB(skb)->frag_max_size;
if (br_parse_ip_options(skb))
/* Drop invalid packet */
--
1.7.10.4
next prev parent reply other threads:[~2015-03-09 17:11 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-03-09 17:14 [PATCH 00/12] Netfilter updates for net-next Pablo Neira Ayuso
2015-03-09 17:14 ` [PATCH 01/12] netfilter: reject: don't send icmp error if csum is invalid Pablo Neira Ayuso
2015-03-09 17:14 ` [PATCH 02/12] netfilter: bridge: rework reject handling Pablo Neira Ayuso
2015-03-09 17:14 ` [PATCH 03/12] netfilter: ipt_CLUSTERIP: deprecate it in favour of xt_cluster Pablo Neira Ayuso
2015-03-09 17:14 ` [PATCH 04/12] netfilter: nf_tables: minor tracing cleanups Pablo Neira Ayuso
2015-03-09 17:14 ` [PATCH 05/12] netfilter: nf_tables: consolidate tracing invocations Pablo Neira Ayuso
2015-03-09 17:14 ` [PATCH 06/12] netfilter: nf_tables: cleanup nf_tables.h Pablo Neira Ayuso
2015-03-09 17:14 ` [PATCH 07/12] netfilter: nf_tables: consolidate Kconfig options Pablo Neira Ayuso
2015-03-09 17:14 ` [PATCH 08/12] netfilter: nf_tables: limit maximum table name length to 32 bytes Pablo Neira Ayuso
2015-03-09 17:14 ` [PATCH 09/12] bridge: move mac header copying into br_netfilter Pablo Neira Ayuso
2015-03-09 17:14 ` [PATCH 10/12] netfilter: bridge: move nf_bridge_update_protocol to where its used Pablo Neira Ayuso
2015-03-09 17:14 ` Pablo Neira Ayuso [this message]
2015-03-09 17:14 ` [PATCH 12/12] netfilter: bridge: move DNAT helper to br_netfilter Pablo Neira Ayuso
2015-03-10 5:28 ` Simon Horman
2015-03-10 9:41 ` Pablo Neira Ayuso
2015-03-09 19:59 ` [PATCH 00/12] Netfilter updates for net-next 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=1425921275-9171-12-git-send-email-pablo@netfilter.org \
--to=pablo@netfilter.org \
--cc=davem@davemloft.net \
--cc=netdev@vger.kernel.org \
--cc=netfilter-devel@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).