Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

net: remove the check argument from __skb_gro_checksum_convert

The argument is always ignored, so remove it.

Signed-off-by: Li RongQing <lirongqing@baidu.com>
Reviewed-by: Simon Horman <simon.horman@netronome.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

authored by

Li RongQing and committed by
David S. Miller
b39c78b2 4a883ccf

+6 -6
+3 -3
include/linux/netdevice.h
··· 2826 2826 } 2827 2827 2828 2828 static inline void __skb_gro_checksum_convert(struct sk_buff *skb, 2829 - __sum16 check, __wsum pseudo) 2829 + __wsum pseudo) 2830 2830 { 2831 2831 NAPI_GRO_CB(skb)->csum = ~pseudo; 2832 2832 NAPI_GRO_CB(skb)->csum_valid = 1; 2833 2833 } 2834 2834 2835 - #define skb_gro_checksum_try_convert(skb, proto, check, compute_pseudo) \ 2835 + #define skb_gro_checksum_try_convert(skb, proto, compute_pseudo) \ 2836 2836 do { \ 2837 2837 if (__skb_gro_checksum_convert_check(skb)) \ 2838 - __skb_gro_checksum_convert(skb, check, \ 2838 + __skb_gro_checksum_convert(skb, \ 2839 2839 compute_pseudo(skb, proto)); \ 2840 2840 } while (0) 2841 2841
+1 -1
net/ipv4/gre_offload.c
··· 174 174 if (skb_gro_checksum_simple_validate(skb)) 175 175 goto out_unlock; 176 176 177 - skb_gro_checksum_try_convert(skb, IPPROTO_GRE, 0, 177 + skb_gro_checksum_try_convert(skb, IPPROTO_GRE, 178 178 null_compute_pseudo); 179 179 } 180 180
+1 -1
net/ipv4/udp_offload.c
··· 480 480 inet_gro_compute_pseudo)) 481 481 goto flush; 482 482 else if (uh->check) 483 - skb_gro_checksum_try_convert(skb, IPPROTO_UDP, uh->check, 483 + skb_gro_checksum_try_convert(skb, IPPROTO_UDP, 484 484 inet_gro_compute_pseudo); 485 485 skip: 486 486 NAPI_GRO_CB(skb)->is_ipv6 = 0;
+1 -1
net/ipv6/udp_offload.c
··· 127 127 ip6_gro_compute_pseudo)) 128 128 goto flush; 129 129 else if (uh->check) 130 - skb_gro_checksum_try_convert(skb, IPPROTO_UDP, uh->check, 130 + skb_gro_checksum_try_convert(skb, IPPROTO_UDP, 131 131 ip6_gro_compute_pseudo); 132 132 133 133 skip: