aboutsummaryrefslogtreecommitdiffstats
path: root/net/ipv4
diff options
context:
space:
mode:
authorBart De Schuymer <bdschuym@pandora.be>2010-04-20 10:22:01 -0400
committerPatrick McHardy <kaber@trash.net>2010-04-20 10:22:01 -0400
commit6c79bf0f2440fd250c8fce8d9b82fcf03d4e8350 (patch)
tree408e0680cac66c1a2ab6350de15a9c623da905a7 /net/ipv4
parent62910554656cdcd6b6f84a5154c4155aae4ca231 (diff)
netfilter: bridge-netfilter: fix refragmenting IP traffic encapsulated in PPPoE traffic
The MTU for IP traffic encapsulated inside PPPoE traffic is smaller than the MTU of the Ethernet device (1500). Connection tracking gathers all IP packets and sometimes will refragment them in ip_fragment(). We then need to subtract the length of the encapsulating header from the mtu used in ip_fragment(). The check in br_nf_dev_queue_xmit() which determines if ip_fragment() has to be called is also updated for the PPPoE-encapsulated packets. nf_bridge_copy_header() is also updated to make sure the PPPoE data length field has the correct value. Signed-off-by: Bart De Schuymer <bdschuym@pandora.be> Signed-off-by: Patrick McHardy <kaber@trash.net>
Diffstat (limited to 'net/ipv4')
-rw-r--r--net/ipv4/ip_output.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/net/ipv4/ip_output.c b/net/ipv4/ip_output.c
index b0b2e3059f11..d979710684b2 100644
--- a/net/ipv4/ip_output.c
+++ b/net/ipv4/ip_output.c
@@ -469,6 +469,10 @@ int ip_fragment(struct sk_buff *skb, int (*output)(struct sk_buff *))
469 469
470 hlen = iph->ihl * 4; 470 hlen = iph->ihl * 4;
471 mtu = dst_mtu(&rt->u.dst) - hlen; /* Size of data space */ 471 mtu = dst_mtu(&rt->u.dst) - hlen; /* Size of data space */
472#ifdef CONFIG_BRIDGE_NETFILTER
473 if (skb->nf_bridge)
474 mtu -= nf_bridge_mtu_reduction(skb);
475#endif
472 IPCB(skb)->flags |= IPSKB_FRAG_COMPLETE; 476 IPCB(skb)->flags |= IPSKB_FRAG_COMPLETE;
473 477
474 /* When frag_list is given, use it. First, check its validity: 478 /* When frag_list is given, use it. First, check its validity: