Commit 50c62a11 authored by Alex Elder's avatar Alex Elder Committed by David S. Miller
Browse files

net: qualcomm: rmnet: simplify some byte order logic 



In rmnet_map_ipv4_ul_csum_header() and rmnet_map_ipv6_ul_csum_header()
the offset within a packet at which checksumming should commence is
calculated.  This calculation involves byte swapping and a forced type
conversion that makes it hard to understand.

Simplify this by computing the offset in host byte order, then
converting the result when assigning it into the header field.

Signed-off-by: default avatarAlex Elder <elder@linaro.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 45f3a13c

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

+6 −10
Original line number Diff line number Diff line
@@ -197,12 +197,10 @@ rmnet_map_ipv4_ul_csum_header(void *iphdr, 
			      struct rmnet_map_ul_csum_header *ul_header,

			      struct sk_buff *skb)

{

	struct iphdr *ip4h = (struct iphdr *)iphdr;

	__be16 *hdr = (__be16 *)ul_header, offset;

	__be16 *hdr = (__be16 *)ul_header;

	struct iphdr *ip4h = iphdr;



	offset = htons((__force u16)(skb_transport_header(skb) -

				     (unsigned char *)iphdr));

	ul_header->csum_start_offset = offset;

	ul_header->csum_start_offset = htons(skb_network_header_len(skb));

	ul_header->csum_insert_offset = skb->csum_offset;

	ul_header->csum_enabled = 1;

	if (ip4h->protocol == IPPROTO_UDP)
@@ -239,12 +237,10 @@ rmnet_map_ipv6_ul_csum_header(void *ip6hdr, 
			      struct rmnet_map_ul_csum_header *ul_header,

			      struct sk_buff *skb)

{

	struct ipv6hdr *ip6h = (struct ipv6hdr *)ip6hdr;

	__be16 *hdr = (__be16 *)ul_header, offset;

	__be16 *hdr = (__be16 *)ul_header;

	struct ipv6hdr *ip6h = ip6hdr;



	offset = htons((__force u16)(skb_transport_header(skb) -

				     (unsigned char *)ip6hdr));

	ul_header->csum_start_offset = offset;

	ul_header->csum_start_offset = htons(skb_network_header_len(skb));

	ul_header->csum_insert_offset = skb->csum_offset;

	ul_header->csum_enabled = 1;