From 96373f6959893109ad074be68b0fe1049099c2e5 Mon Sep 17 00:00:00 2001 From: Joel Cunningham Date: Wed, 20 Jan 2016 11:34:25 -0600 Subject: [PATCH] Define LWIP_CHKSUM_COPY_ALGORITHM when port provides LWIP_CHKSUM_COPY macro When the port has LWIP_CHECKSUM_ON_COPY enabled and provides a definition of LWIP_CHKSUM_COPY, the existing logic left LWIP_CHKSUM_COPY_ALGORITHM undefined In this case we want it to be defined to 0 since none of the copy checksum algorithms provided are being used This commit also introduces indentation matching LWIP_CHKSUM to improve the readability of the code --- src/include/lwip/inet_chksum.h | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/src/include/lwip/inet_chksum.h b/src/include/lwip/inet_chksum.h index d13c9674..1766f4b5 100644 --- a/src/include/lwip/inet_chksum.h +++ b/src/include/lwip/inet_chksum.h @@ -56,14 +56,16 @@ #if LWIP_CHECKSUM_ON_COPY /** Function-like macro: same as MEMCPY but returns the checksum of copied data as u16_t */ -#ifndef LWIP_CHKSUM_COPY -#define LWIP_CHKSUM_COPY(dst, src, len) lwip_chksum_copy(dst, src, len) -#ifndef LWIP_CHKSUM_COPY_ALGORITHM -#define LWIP_CHKSUM_COPY_ALGORITHM 1 -#endif /* LWIP_CHKSUM_COPY_ALGORITHM */ -#endif /* LWIP_CHKSUM_COPY */ +# ifndef LWIP_CHKSUM_COPY +# define LWIP_CHKSUM_COPY(dst, src, len) lwip_chksum_copy(dst, src, len) +# ifndef LWIP_CHKSUM_COPY_ALGORITHM +# define LWIP_CHKSUM_COPY_ALGORITHM 1 +# endif /* LWIP_CHKSUM_COPY_ALGORITHM */ +# else /* LWIP_CHKSUM_COPY */ +# define LWIP_CHKSUM_COPY_ALGORITHM 0 +# endif /* LWIP_CHKSUM_COPY */ #else /* LWIP_CHECKSUM_ON_COPY */ -#define LWIP_CHKSUM_COPY_ALGORITHM 0 +# define LWIP_CHKSUM_COPY_ALGORITHM 0 #endif /* LWIP_CHECKSUM_ON_COPY */ #ifdef __cplusplus