Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0805a0c0 authored by Dmitriy Cherkasov's avatar Dmitriy Cherkasov Committed by Greg Kroah-Hartman
Browse files

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: default avatarDmitriy Cherkasov <dmitriy@oss-tech.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent cbe5843e

drivers/staging/lustre/lnet/klnds/socklnd/socklnd.h

+0 −11
Original line number Diff line number Diff line
@@ -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)

{

drivers/staging/lustre/lnet/klnds/socklnd/socklnd_lib.c

+10 −10
Original line number Diff line number Diff line
@@ -201,7 +201,7 @@ ksocknal_lib_recv_iov(struct ksock_conn *conn) 
			if (fragnob > sum)

				fragnob = sum;



			conn->ksnc_rx_csum = ksocknal_csum(conn->ksnc_rx_csum,

			conn->ksnc_rx_csum = crc32_le(conn->ksnc_rx_csum,

						      iov[i].iov_base,

						      fragnob);

		}
@@ -243,7 +243,7 @@ ksocknal_lib_recv_kiov(struct ksock_conn *conn) 
			if (fragnob > sum)

				fragnob = sum;



			conn->ksnc_rx_csum = ksocknal_csum(conn->ksnc_rx_csum,

			conn->ksnc_rx_csum = crc32_le(conn->ksnc_rx_csum,

						      base, fragnob);



			kunmap(kiov[i].bv_page);
@@ -265,7 +265,7 @@ ksocknal_lib_csum_tx(struct ksock_tx *tx) 


	tx->tx_msg.ksm_csum = 0;



	csum = ksocknal_csum(~0, tx->tx_iov[0].iov_base,

	csum = crc32_le(~0, tx->tx_iov[0].iov_base,

			tx->tx_iov[0].iov_len);



	if (tx->tx_kiov) {
@@ -273,13 +273,13 @@ ksocknal_lib_csum_tx(struct ksock_tx *tx) 
			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,

			csum = crc32_le(csum, tx->tx_iov[i].iov_base,

					tx->tx_iov[i].iov_len);

	}