staging: lustre: lnet: remove dead code and useless wrapper

After removing commented out code, ksocknal_csum() becomes a useless
wrapper for crc32_le(). Remove it, and instead call crc32_le() directly.

Fixes the following checkpatch warning:

WARNING: space prohibited before semicolon

Signed-off-by: Dmitriy Cherkasov <dmitriy@oss-tech.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/lustre/lnet/klnds/socklnd/socklnd.h b/drivers/staging/lustre/lnet/klnds/socklnd/socklnd.h
index 5540de65f9a2274dcdba4a74be9f205a3b9e3c01..9eb169da2c2fa1ab3f117408731872fe6b9115c8 100644 (file)
--- a/drivers/staging/lustre/lnet/klnds/socklnd/socklnd.h
+++ b/drivers/staging/lustre/lnet/klnds/socklnd/socklnd.h
@@ -519,17 +519,6 @@ extern struct ksock_proto ksocknal_protocol_v3x;
 #define CPU_MASK_NONE   0UL
 #endif
 
-static inline __u32 ksocknal_csum(__u32 crc, unsigned char const *p, size_t len)
-{
-#if 1
-       return crc32_le(crc, p, len);
-#else
-       while (len-- > 0)
-               crc = ((crc + 0x100) & ~0xff) | ((crc + *p++) & 0xff) ;
-       return crc;
-#endif
-}
-
 static inline int
 ksocknal_route_mask(void)
 {

diff --git a/drivers/staging/lustre/lnet/klnds/socklnd/socklnd_lib.c b/drivers/staging/lustre/lnet/klnds/socklnd/socklnd_lib.c
index 8a036f4eb8d8e59f751470ad12698c2b4abd9967..9c328dc6537b8235b88add837512bff7c7da8cff 100644 (file)
--- a/drivers/staging/lustre/lnet/klnds/socklnd/socklnd_lib.c
+++ b/drivers/staging/lustre/lnet/klnds/socklnd/socklnd_lib.c
@@ -201,9 +201,9 @@ ksocknal_lib_recv_iov(struct ksock_conn *conn)
                        if (fragnob > sum)
                                fragnob = sum;
 
-                       conn->ksnc_rx_csum = ksocknal_csum(conn->ksnc_rx_csum,
-                                                          iov[i].iov_base,
-                                                          fragnob);
+                       conn->ksnc_rx_csum = crc32_le(conn->ksnc_rx_csum,
+                                                     iov[i].iov_base,
+                                                     fragnob);
                }
                conn->ksnc_msg.ksm_csum = saved_csum;
        }
@@ -243,8 +243,8 @@ ksocknal_lib_recv_kiov(struct ksock_conn *conn)
                        if (fragnob > sum)
                                fragnob = sum;
 
-                       conn->ksnc_rx_csum = ksocknal_csum(conn->ksnc_rx_csum,
-                                                          base, fragnob);
+                       conn->ksnc_rx_csum = crc32_le(conn->ksnc_rx_csum,
+                                                     base, fragnob);
 
                        kunmap(kiov[i].bv_page);
                }
@@ -265,22 +265,22 @@ ksocknal_lib_csum_tx(struct ksock_tx *tx)
 
        tx->tx_msg.ksm_csum = 0;
 
-       csum = ksocknal_csum(~0, tx->tx_iov[0].iov_base,
-                            tx->tx_iov[0].iov_len);
+       csum = crc32_le(~0, tx->tx_iov[0].iov_base,
+                       tx->tx_iov[0].iov_len);
 
        if (tx->tx_kiov) {
                for (i = 0; i < tx->tx_nkiov; i++) {
                        base = kmap(tx->tx_kiov[i].bv_page) +
                               tx->tx_kiov[i].bv_offset;
 
-                       csum = ksocknal_csum(csum, base, tx->tx_kiov[i].bv_len);
+                       csum = crc32_le(csum, base, tx->tx_kiov[i].bv_len);
 
                        kunmap(tx->tx_kiov[i].bv_page);
                }
        } else {
                for (i = 1; i < tx->tx_niov; i++)
-                       csum = ksocknal_csum(csum, tx->tx_iov[i].iov_base,
-                                            tx->tx_iov[i].iov_len);
+                       csum = crc32_le(csum, tx->tx_iov[i].iov_base,
+                                       tx->tx_iov[i].iov_len);
        }
 
        if (*ksocknal_tunables.ksnd_inject_csum_error) {