Commit b39c78b2 authored by Li RongQing's avatar Li RongQing Committed by David S. Miller

net: remove the check argument from __skb_gro_checksum_convert

The argument is always ignored, so remove it.
Signed-off-by: default avatarLi RongQing <lirongqing@baidu.com>
Reviewed-by: default avatarSimon Horman <simon.horman@netronome.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 4a883ccf
...@@ -2826,16 +2826,16 @@ static inline bool __skb_gro_checksum_convert_check(struct sk_buff *skb) ...@@ -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)
......
...@@ -174,7 +174,7 @@ static struct sk_buff *gre_gro_receive(struct list_head *head, ...@@ -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);
} }
......
...@@ -480,7 +480,7 @@ struct sk_buff *udp4_gro_receive(struct list_head *head, struct sk_buff *skb) ...@@ -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;
......
...@@ -127,7 +127,7 @@ struct sk_buff *udp6_gro_receive(struct list_head *head, struct sk_buff *skb) ...@@ -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:
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment