path: root/net/bridge/br_netfilter.c
diff options
authorFlorian Westphal <fw@strlen.de>2015-06-05 13:28:38 +0200
committerPablo Neira Ayuso <pablo@netfilter.org>2015-06-12 14:16:46 +0200
commit33b1f31392861947fa2a2a57c3a39ab63b8c9f9d (patch)
treec9fc6aaa8a1e64e1e884b55d425d45254fef1c1f /net/bridge/br_netfilter.c
parentnetfilter: bridge: forward IPv6 fragmented packets (diff)
net: ip_fragment: remove BRIDGE_NETFILTER mtu special handling
since commit d6b915e29f4adea9 ("ip_fragment: don't forward defragmented DF packet") the largest fragment size is available in the IPCB. Therefore we no longer need to care about 'encapsulation' overhead of stripped PPPOE/VLAN headers since ip_do_fragment doesn't use device mtu in such cases. Signed-off-by: Florian Westphal <fw@strlen.de> Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
Diffstat (limited to 'net/bridge/br_netfilter.c')
1 files changed, 7 insertions, 0 deletions
diff --git a/net/bridge/br_netfilter.c b/net/bridge/br_netfilter.c
index 535f9dae743e..1e62ae5d8f4e 100644
--- a/net/bridge/br_netfilter.c
+++ b/net/bridge/br_netfilter.c
@@ -936,6 +936,13 @@ static int br_nf_ip_fragment(struct sock *sk, struct sk_buff *skb,
return ip_do_fragment(sk, skb, output);
+static unsigned int nf_bridge_mtu_reduction(const struct sk_buff *skb)
+ if (skb->nf_bridge->orig_proto == BRNF_PROTO_PPPOE)
+ return PPPOE_SES_HLEN;
+ return 0;
static int br_nf_dev_queue_xmit(struct sock *sk, struct sk_buff *skb)
struct nf_bridge_info *nf_bridge;