net: ip_fragment: remove BRIDGE_NETFILTER mtu special handling
since commit d6b915e29f
("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>
This commit is contained in:
parent
efb6de9b4b
commit
33b1f31392
|
@ -20,13 +20,6 @@ enum nf_br_hook_priorities {
|
|||
#define BRNF_BRIDGED_DNAT 0x02
|
||||
#define BRNF_NF_BRIDGE_PREROUTING 0x08
|
||||
|
||||
static inline 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;
|
||||
}
|
||||
|
||||
int br_handle_frame_finish(struct sock *sk, struct sk_buff *skb);
|
||||
|
||||
static inline void br_drop_fake_rtable(struct sk_buff *skb)
|
||||
|
|
|
@ -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;
|
||||
|
|
|
@ -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:
|
||||
|
|
Loading…
Reference in New Issue