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

Commit 07f0757a authored by Joe Perches's avatar Joe Perches Committed by David S. Miller
Browse files

include/net net/ - csum_partial - remove unnecessary casts 



The first argument to csum_partial is const void *
casts to char/u8 * are not necessary

Signed-off-by: default avatarJoe Perches <joe@perches.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent a7a0d6a8

include/net/checksum.h

+1 −1
Original line number Diff line number Diff line
@@ -98,7 +98,7 @@ static inline void csum_replace4(__sum16 *sum, __be32 from, __be32 to) 
{

	__be32 diff[] = { ~from, to };



	*sum = csum_fold(csum_partial((char *)diff, sizeof(diff), ~csum_unfold(*sum)));

	*sum = csum_fold(csum_partial(diff, sizeof(diff), ~csum_unfold(*sum)));

}



static inline void csum_replace2(__sum16 *sum, __be16 from, __be16 to)

include/net/ip_vs.h

+3 −3
Original line number Diff line number Diff line
@@ -913,7 +913,7 @@ static inline __wsum ip_vs_check_diff4(__be32 old, __be32 new, __wsum oldsum) 
{

	__be32 diff[2] = { ~old, new };



	return csum_partial((char *) diff, sizeof(diff), oldsum);

	return csum_partial(diff, sizeof(diff), oldsum);

}



#ifdef CONFIG_IP_VS_IPV6
@@ -923,7 +923,7 @@ static inline __wsum ip_vs_check_diff16(const __be32 *old, const __be32 *new, 
	__be32 diff[8] = { ~old[3], ~old[2], ~old[1], ~old[0],

			    new[3],  new[2],  new[1],  new[0] };



	return csum_partial((char *) diff, sizeof(diff), oldsum);

	return csum_partial(diff, sizeof(diff), oldsum);

}

#endif
@@ -931,7 +931,7 @@ static inline __wsum ip_vs_check_diff2(__be16 old, __be16 new, __wsum oldsum) 
{

	__be16 diff[2] = { ~old, new };



	return csum_partial((char *) diff, sizeof(diff), oldsum);

	return csum_partial(diff, sizeof(diff), oldsum);

}



#endif /* __KERNEL__ */

net/core/netpoll.c

+1 −1
Original line number Diff line number Diff line
@@ -343,7 +343,7 @@ void netpoll_send_udp(struct netpoll *np, const char *msg, int len) 
	udph->check = csum_tcpudp_magic(htonl(np->local_ip),

					htonl(np->remote_ip),

					udp_len, IPPROTO_UDP,

					csum_partial((unsigned char *)udph, udp_len, 0));

					csum_partial(udph, udp_len, 0));

	if (udph->check == 0)

		udph->check = CSUM_MANGLED_0;

net/ipv4/inet_lro.c

+2 −2
Original line number Diff line number Diff line
@@ -120,7 +120,7 @@ static void lro_update_tcp_ip_header(struct net_lro_desc *lro_desc) 
	iph->check = ip_fast_csum((u8 *)lro_desc->iph, iph->ihl);



	tcph->check = 0;

	tcp_hdr_csum = csum_partial((u8 *)tcph, TCP_HDR_LEN(tcph), 0);

	tcp_hdr_csum = csum_partial(tcph, TCP_HDR_LEN(tcph), 0);

	lro_desc->data_csum = csum_add(lro_desc->data_csum, tcp_hdr_csum);

	tcph->check = csum_tcpudp_magic(iph->saddr, iph->daddr,

					lro_desc->ip_tot_len -
@@ -135,7 +135,7 @@ static __wsum lro_tcp_data_csum(struct iphdr *iph, struct tcphdr *tcph, int len) 
	__wsum tcp_ps_hdr_csum;



	tcp_csum = ~csum_unfold(tcph->check);

	tcp_hdr_csum = csum_partial((u8 *)tcph, TCP_HDR_LEN(tcph), tcp_csum);

	tcp_hdr_csum = csum_partial(tcph, TCP_HDR_LEN(tcph), tcp_csum);



	tcp_ps_hdr_csum = csum_tcpudp_nofold(iph->saddr, iph->daddr,

					     len + TCP_HDR_LEN(tcph),

net/ipv4/tcp_ipv4.c

+2 −2
Original line number Diff line number Diff line
@@ -492,7 +492,7 @@ void tcp_v4_send_check(struct sock *sk, int len, struct sk_buff *skb) 
		skb->csum_offset = offsetof(struct tcphdr, check);

	} else {

		th->check = tcp_v4_check(len, inet->saddr, inet->daddr,

					 csum_partial((char *)th,

					 csum_partial(th,

						      th->doff << 2,

						      skb->csum));

	}
@@ -726,7 +726,7 @@ static int __tcp_v4_send_synack(struct sock *sk, struct request_sock *req, 
		th->check = tcp_v4_check(skb->len,

					 ireq->loc_addr,

					 ireq->rmt_addr,

					 csum_partial((char *)th, skb->len,

					 csum_partial(th, skb->len,

						      skb->csum));



		err = ip_build_and_send_pkt(skb, sk, ireq->loc_addr,