net: remove unused parameter from skb_checksum_try_convert

the check parameter is never used

Signed-off-by: Li RongQing <lirongqing@baidu.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/include/linux/skbuff.h b/include/linux/skbuff.h
index b5d427b149c9215c59caf572fdb0daf27662f429..7ece49d5f8ef72be44142ed09944cc50f7833efb 100644 (file)
--- a/include/linux/skbuff.h
+++ b/include/linux/skbuff.h
@@ -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,

diff --git a/net/ipv4/gre_demux.c b/net/ipv4/gre_demux.c
index 293acfb3637651bc2df89de86498ad697b90f5de..44bfeecac33e58f5fae1f1790825f73cf8ca6ffb 100644 (file)
--- a/net/ipv4/gre_demux.c
+++ b/net/ipv4/gre_demux.c
@@ -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;

diff --git a/net/ipv4/udp.c b/net/ipv4/udp.c
index 1b971bd95786cf4005977d5d28568299b9bbee7c..c21862ba9c02e022930010df0aba97648a2f0100 100644 (file)
--- a/net/ipv4/udp.c
+++ b/net/ipv4/udp.c
@@ -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);
 

diff --git a/net/ipv6/udp.c b/net/ipv6/udp.c
index 66ca5a4b17c48c3637f7009b0ddcfebc655616bd..4406e059da6804a0a6a7c611489602a2810638b5 100644 (file)
--- a/net/ipv6/udp.c
+++ b/net/ipv6/udp.c
@@ -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);