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

Commit 3ee4da32 authored Nov 09, 2018 by Kaustubh Pandey Committed by Gerrit - the friendly Code Review server Nov 14, 2018

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



This reverts commit 0ed4229b.
The change drops the non-last fragments whose size is less
than min mtu, this is currently breaking MT call on IWLAN.

It is observed that the SIP_INVITE has fragments of size
less than min mtu, currently reverting the change to allow
MT call to go through.

Change-Id: I78a10186792ec6c9febe141899ddc8ba5b815342
Signed-off-by: Sharath Chandra Vurukala <sharathv@codeaurora.org>
Signed-off-by: Kaustubh Pandey <kapandey@codeaurora.org>

parent 4c314540

net/ipv6/netfilter/nf_conntrack_reasm.c

+0 −4

Original line number	Original line	Diff line number	Diff line
	@@ -567,10 +567,6 @@ int nf_ct_frag6_gather(struct net net, struct sk_buff skb, u32 user)
	hdr = ipv6_hdr(skb);		hdr = ipv6_hdr(skb);
	fhdr = (struct frag_hdr *)skb_transport_header(skb);		fhdr = (struct frag_hdr *)skb_transport_header(skb);

	if (skb->len - skb_network_offset(skb) < IPV6_MIN_MTU &&
	fhdr->frag_off & htons(IP6_MF))
	return -EINVAL;

	skb_orphan(skb);		skb_orphan(skb);
	fq = fq_find(net, fhdr->identification, user, hdr,		fq = fq_find(net, fhdr->identification, user, hdr,
	skb->dev ? skb->dev->ifindex : 0);		skb->dev ? skb->dev->ifindex : 0);

net/ipv6/reassembly.c

+0 −4

Original line number	Original line	Diff line number	Diff line
	@@ -523,10 +523,6 @@ static int ipv6_frag_rcv(struct sk_buff *skb)
	return 1;		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;		iif = skb->dev ? skb->dev->ifindex : 0;
	fq = fq_find(net, fhdr->identification, hdr, iif);		fq = fq_find(net, fhdr->identification, hdr, iif);
	if (fq) {		if (fq) {