Merge "net: qualcomm: rmnet: Only update headers for coalesced scenarios" (fe96ce17) · Commits · e / devices / android_kernel_oneplus_sm7250

drivers/net/ethernet/qualcomm/rmnet/rmnet_descriptor.c

+16 −26

Original line number	Diff line number	Diff line
		@@ -381,6 +381,7 @@ static void rmnet_frag_gso_stamp(struct sk_buff *skb,
		bool ipv4 = frag_desc->ip_proto == 4;

		if (ipv4) {
		iph->tot_len = htons(skb->len);
		iph->check = 0;
		iph->check = ip_fast_csum(iph, iph->ihl);
		pseudo = ~csum_tcpudp_magic(iph->saddr, iph->daddr,
		@@ -389,6 +390,8 @@ static void rmnet_frag_gso_stamp(struct sk_buff *skb,
		} else {
		struct ipv6hdr ip6h = (struct ipv6hdr )iph;

		/* Payload length includes any extension headers */
		ip6h->payload_len = htons(skb->len - sizeof(*ip6h));
		pseudo = ~csum_ipv6_magic(&ip6h->saddr, &ip6h->daddr,
		pkt_len, frag_desc->trans_proto, 0);
		}
		@@ -404,6 +407,7 @@ static void rmnet_frag_gso_stamp(struct sk_buff *skb,
		struct udphdr up = (struct udphdr )
		((u8 *)iph + frag_desc->ip_len);

		up->len = htons(pkt_len);
		up->check = pseudo;
		shinfo->gso_type = SKB_GSO_UDP_L4;
		skb->csum_offset = offsetof(struct udphdr, check);
		@@ -428,7 +432,6 @@ static struct sk_buff rmnet_alloc_skb(struct rmnet_frag_descriptor frag_desc,
		/* Use the exact sizes if we know them (i.e. RSB/RSC, rmnet_perf) */
		if (frag_desc->hdrs_valid) {
		u16 hdr_len = frag_desc->ip_len + frag_desc->trans_len;
		u16 data_len = frag_desc->gso_size * frag_desc->gso_segs;

		head_skb = alloc_skb(hdr_len + RMNET_MAP_DEAGGR_HEADROOM,
		GFP_ATOMIC);
		@@ -439,30 +442,9 @@ static struct sk_buff rmnet_alloc_skb(struct rmnet_frag_descriptor frag_desc,
		skb_put_data(head_skb, frag_desc->hdr_ptr, hdr_len);
		skb_reset_network_header(head_skb);

		/* Update header lengths after RSB/RSC/perf */
		if (frag_desc->ip_proto == 4) {
		struct iphdr *iph = ip_hdr(head_skb);
		__be16 tot_len = htons(hdr_len + data_len);

		csum_replace2(&iph->check, iph->tot_len, tot_len);
		iph->tot_len = tot_len;
		} else {
		struct ipv6hdr *ip6h = ipv6_hdr(head_skb);

		ip6h->payload_len = htons(hdr_len + data_len -
		sizeof(*ip6h));
		}

		if (frag_desc->trans_len) {
		if (frag_desc->trans_len)
		skb_set_transport_header(head_skb, frag_desc->ip_len);

		if (frag_desc->trans_proto == IPPROTO_UDP) {
		struct udphdr *uh = udp_hdr(head_skb);

		uh->len = htons(data_len + sizeof(*uh));
		}
		}

		/* Packets that have no data portion don't need any frags */
		if (hdr_len == skb_frag_size(&frag_desc->frag))
		goto skip_frags;
		@@ -574,10 +556,13 @@ static struct sk_buff rmnet_alloc_skb(struct rmnet_frag_descriptor frag_desc,
		unsigned int offset = skb_transport_offset(head_skb);
		__sum16 pseudo;

		/* Calculate pseudo header */
		/* Calculate pseudo header and update header fields */
		if (frag_desc->ip_proto == 4) {
		struct iphdr *iph = ip_hdr(head_skb);
		__be16 tot_len = htons(head_skb->len);

		csum_replace2(&iph->check, iph->tot_len, tot_len);
		iph->tot_len = tot_len;
		pseudo = ~csum_tcpudp_magic(iph->saddr, iph->daddr,
		head_skb->len -
		frag_desc->ip_len,
		@@ -585,16 +570,21 @@ static struct sk_buff rmnet_alloc_skb(struct rmnet_frag_descriptor frag_desc,
		} else {
		struct ipv6hdr *ip6h = ipv6_hdr(head_skb);

		ip6h->payload_len = htons(head_skb->len -
		sizeof(*ip6h));
		pseudo = ~csum_ipv6_magic(&ip6h->saddr, &ip6h->daddr,
		head_skb->len -
		frag_desc->ip_len,
		frag_desc->trans_proto, 0);
		}

		if (frag_desc->trans_proto == IPPROTO_TCP)
		if (frag_desc->trans_proto == IPPROTO_TCP) {
		check = &tcp_hdr(head_skb)->check;
		else
		} else {
		udp_hdr(head_skb)->len = htons(head_skb->len -
		frag_desc->ip_len);
		check = &udp_hdr(head_skb)->check;
		}

		*check = pseudo;
		csum = skb_checksum(head_skb, offset, head_skb->len - offset,