diff options
| author | Florian Westphal <fw@strlen.de> | 2015-06-05 13:28:38 +0200 |
|---|---|---|
| committer | Pablo Neira Ayuso <pablo@netfilter.org> | 2015-06-12 14:16:46 +0200 |
| commit | 33b1f31392861947fa2a2a57c3a39ab63b8c9f9d (patch) | |
| tree | c9fc6aaa8a1e64e1e884b55d425d45254fef1c1f /net/ipv4/ip_output.c | |
| parent | efb6de9b4ba0092b2c55f6a52d16294a8a698edd (diff) | |
| download | linux-stable-33b1f31392861947fa2a2a57c3a39ab63b8c9f9d.tar.gz linux-stable-33b1f31392861947fa2a2a57c3a39ab63b8c9f9d.tar.bz2 linux-stable-33b1f31392861947fa2a2a57c3a39ab63b8c9f9d.zip | |
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/ipv4/ip_output.c')
| -rw-r--r-- | net/ipv4/ip_output.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/net/ipv4/ip_output.c b/net/ipv4/ip_output.c index f5f5ef1cebd5..19d7e43b5370 100644 --- a/net/ipv4/ip_output.c +++ b/net/ipv4/ip_output.c @@ -549,10 +549,6 @@ int ip_do_fragment(struct sock *sk, struct sk_buff *skb, hlen = iph->ihl * 4; mtu = mtu - hlen; /* Size of data space */ -#if IS_ENABLED(CONFIG_BRIDGE_NETFILTER) - if (skb->nf_bridge) - mtu -= nf_bridge_mtu_reduction(skb); -#endif IPCB(skb)->flags |= IPSKB_FRAG_COMPLETE; /* When frag_list is given, use it. First, check its validity: |