Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 48beb346 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "Revert "ipv6: defrag: drop non-last frags smaller than min mtu""

parents 53ec8440 83f4d9a5

net/ipv6/netfilter/nf_conntrack_reasm.c

+0 −4
Original line number Diff line number Diff line
@@ -576,10 +576,6 @@ struct sk_buff *nf_ct_frag6_gather(struct net *net, struct sk_buff *skb, u32 use 
	hdr = ipv6_hdr(clone);

	fhdr = (struct frag_hdr *)skb_transport_header(clone);



	if (clone->len - skb_network_offset(clone) < IPV6_MIN_MTU &&

	    fhdr->frag_off & htons(IP6_MF))

		goto ret_orig;



	skb_orphan(skb);

	fq = fq_find(net, fhdr->identification, user, hdr,

		     skb->dev ? skb->dev->ifindex : 0);

net/ipv6/reassembly.c

+0 −4
Original line number Diff line number Diff line
@@ -516,10 +516,6 @@ static int ipv6_frag_rcv(struct sk_buff *skb) 
		return 1;

	}



	if (skb->len - skb_network_offset(skb) < IPV6_MIN_MTU &&

	    fhdr->frag_off & htons(IP6_MF))

		goto fail_hdr;



	iif = skb->dev ? skb->dev->ifindex : 0;

	fq = fq_find(net, fhdr->identification, hdr, iif);

	if (fq) {