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

Commit 578beef0 authored by Linux Build Service Account's avatar Linux Build Service Account
Browse files

Merge 8a3c6765 on remote branch 

Change-Id: I03c3177c89dc90232f70d6ad44276b33a341cb6f
parents 67588b69 8a3c6765

core/rmnet_descriptor.c

+10 −1
Original line number Diff line number Diff line
@@ -340,7 +340,6 @@ int rmnet_frag_ipv6_skip_exthdr(struct rmnet_frag_descriptor *frag_desc, 
		if (!hp)

			return -EINVAL;



		hp = rmnet_frag_data_ptr(frag_desc) + start;

		if (nexthdr == NEXTHDR_FRAGMENT) {

			u32 off = offsetof(struct frag_hdr, frag_off);

			__be16 *fp, __fp;
@@ -1005,6 +1004,13 @@ static bool rmnet_frag_validate_csum(struct rmnet_frag_descriptor *frag_desc) 
	__wsum csum;

	__sum16 pseudo;



	/* Keep analysis tools happy, since they will see that

	 * rmnet_frag_data_ptr() could return NULL. It can't in this case,

	 * since we can't get this far otherwise...

	 */

	if (unlikely(!data))

		return false;



	datagram_len = frag_desc->len - frag_desc->ip_len;

	if (frag_desc->ip_proto == 4) {

		struct iphdr *iph = (struct iphdr *)data;
@@ -1061,6 +1067,9 @@ rmnet_frag_segment_coal_data(struct rmnet_frag_descriptor *coal_desc, 
	 * for it.

	*/

	version = rmnet_frag_data_ptr(coal_desc);

	if (unlikely(!version))

		return;



	if ((*version & 0xF0) == 0x40) {

		struct iphdr *iph, __iph;