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

Commit e4aa33ad authored by Li RongQing's avatar Li RongQing Committed by David S. Miller
Browse files

net: remove unused parameter from skb_checksum_try_convert 



the check parameter is never used

Signed-off-by: default avatarLi RongQing <lirongqing@baidu.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 60a6127c

include/linux/skbuff.h

+3 −5
Original line number Diff line number Diff line
@@ -3919,18 +3919,16 @@ static inline bool __skb_checksum_convert_check(struct sk_buff *skb) 
	return (skb->ip_summed == CHECKSUM_NONE && skb->csum_valid);

}



static inline void __skb_checksum_convert(struct sk_buff *skb,

					  __sum16 check, __wsum pseudo)

static inline void __skb_checksum_convert(struct sk_buff *skb, __wsum pseudo)

{

	skb->csum = ~pseudo;

	skb->ip_summed = CHECKSUM_COMPLETE;

}



#define skb_checksum_try_convert(skb, proto, check, compute_pseudo)	\

#define skb_checksum_try_convert(skb, proto, compute_pseudo)	\

do {									\

	if (__skb_checksum_convert_check(skb))				\

		__skb_checksum_convert(skb, check,			\

				       compute_pseudo(skb, proto));	\

		__skb_checksum_convert(skb, compute_pseudo(skb, proto)); \

} while (0)



static inline void skb_remcsum_adjust_partial(struct sk_buff *skb, void *ptr,

net/ipv4/gre_demux.c

+1 −1
Original line number Diff line number Diff line
@@ -83,7 +83,7 @@ int gre_parse_header(struct sk_buff *skb, struct tnl_ptk_info *tpi, 
	options = (__be32 *)(greh + 1);

	if (greh->flags & GRE_CSUM) {

		if (!skb_checksum_simple_validate(skb)) {

			skb_checksum_try_convert(skb, IPPROTO_GRE, 0,

			skb_checksum_try_convert(skb, IPPROTO_GRE,

						 null_compute_pseudo);

		} else if (csum_err) {

			*csum_err = true;

net/ipv4/udp.c

+1 −2
Original line number Diff line number Diff line
@@ -2224,8 +2224,7 @@ static int udp_unicast_rcv_skb(struct sock *sk, struct sk_buff *skb, 
	int ret;



	if (inet_get_convert_csum(sk) && uh->check && !IS_UDPLITE(sk))

		skb_checksum_try_convert(skb, IPPROTO_UDP, uh->check,

					 inet_compute_pseudo);

		skb_checksum_try_convert(skb, IPPROTO_UDP, inet_compute_pseudo);



	ret = udp_queue_rcv_skb(sk, skb);

net/ipv6/udp.c

+1 −2
Original line number Diff line number Diff line
@@ -826,8 +826,7 @@ static int udp6_unicast_rcv_skb(struct sock *sk, struct sk_buff *skb, 
	int ret;



	if (inet_get_convert_csum(sk) && uh->check && !IS_UDPLITE(sk))

		skb_checksum_try_convert(skb, IPPROTO_UDP, uh->check,

					 ip6_compute_pseudo);

		skb_checksum_try_convert(skb, IPPROTO_UDP, ip6_compute_pseudo);



	ret = udpv6_queue_rcv_skb(sk, skb);