ich777/linux_media
1
0
Fork 0
mirror of https://github.com/tbsdtv/linux_media.git synced 2025-07-23 12:43:29 +02:00
Code Issues Packages Projects Releases Wiki Activity

net: remove the check argument from __skb_gro_checksum_convert

Browse Source 
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>
This commit is contained in:
Li RongQing
2020-01-03 11:51:00 +08:00
committed by David S. Miller
parent 4a883ccfba
commit b39c78b2aa
4 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
include/linux/netdevice.h
View File

@@ -2826,16 +2826,16 @@ static inline bool __skb_gro_checksum_convert_check(struct sk_buff *skb)
} }
static inline void __skb_gro_checksum_convert(struct sk_buff *skb, static inline void __skb_gro_checksum_convert(struct sk_buff *skb,
__sum16 check, __wsum pseudo) __wsum pseudo)
{ {
NAPI_GRO_CB(skb)->csum = ~pseudo; NAPI_GRO_CB(skb)->csum = ~pseudo;
NAPI_GRO_CB(skb)->csum_valid = 1; NAPI_GRO_CB(skb)->csum_valid = 1;
} }
#define skb_gro_checksum_try_convert(skb, proto, check, compute_pseudo) \ #define skb_gro_checksum_try_convert(skb, proto, compute_pseudo) \
do { \ do { \
if (__skb_gro_checksum_convert_check(skb)) \ if (__skb_gro_checksum_convert_check(skb)) \
__skb_gro_checksum_convert(skb, check, \ __skb_gro_checksum_convert(skb, \
compute_pseudo(skb, proto)); \ compute_pseudo(skb, proto)); \
} while (0) } while (0)

2
net/ipv4/gre_offload.c
View File

@@ -174,7 +174,7 @@ static struct sk_buff *gre_gro_receive(struct list_head *head,
if (skb_gro_checksum_simple_validate(skb)) if (skb_gro_checksum_simple_validate(skb))
goto out_unlock; goto out_unlock;
skb_gro_checksum_try_convert(skb, IPPROTO_GRE, 0, skb_gro_checksum_try_convert(skb, IPPROTO_GRE,
null_compute_pseudo); null_compute_pseudo);
} }

2
net/ipv4/udp_offload.c
View File

@@ -480,7 +480,7 @@ struct sk_buff *udp4_gro_receive(struct list_head *head, struct sk_buff *skb)
inet_gro_compute_pseudo)) inet_gro_compute_pseudo))
goto flush; goto flush;
else if (uh->check) else if (uh->check)
skb_gro_checksum_try_convert(skb, IPPROTO_UDP, uh->check, skb_gro_checksum_try_convert(skb, IPPROTO_UDP,
inet_gro_compute_pseudo); inet_gro_compute_pseudo);
skip: skip:
NAPI_GRO_CB(skb)->is_ipv6 = 0; NAPI_GRO_CB(skb)->is_ipv6 = 0;

2
net/ipv6/udp_offload.c
View File

@@ -127,7 +127,7 @@ struct sk_buff *udp6_gro_receive(struct list_head *head, struct sk_buff *skb)
ip6_gro_compute_pseudo)) ip6_gro_compute_pseudo))
goto flush; goto flush;
else if (uh->check) else if (uh->check)
skb_gro_checksum_try_convert(skb, IPPROTO_UDP, uh->check, skb_gro_checksum_try_convert(skb, IPPROTO_UDP,
ip6_gro_compute_pseudo); ip6_gro_compute_pseudo);
skip: skip: