diff mbox series

[API-NEXT,v1,2/2] linux-gen: ipsec: use new odp checksum API

Message ID 1510066821-31264-3-git-send-email-odpbot@yandex.ru
State Superseded
Headers show
Series [API-NEXT,v1,1/2] helper: use new odp checksum API | expand

Commit Message

Github ODP bot Nov. 7, 2017, 3 p.m. UTC 
From: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov@linaro.org>


Use odp_chksum_ones_comp16 which may be platform-optimized.

Signed-off-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov@linaro.org>

---
/** Email created from pull request 280 (lumag:chksum)
 ** https://github.com/Linaro/odp/pull/280
 ** Patch: https://github.com/Linaro/odp/pull/280.patch
 ** Base sha: d22c949cc466bf28de559855a1cb525740578137
 ** Merge commit sha: 93032be4dd8c5d534c9898a54df6cb7977522c80
 **/
 platform/linux-generic/odp_ipsec.c | 31 ++-----------------------------
 1 file changed, 2 insertions(+), 29 deletions(-)
diff mbox series

Patch

diff --git a/platform/linux-generic/odp_ipsec.c b/platform/linux-generic/odp_ipsec.c
index e57736c2a..b67cd3158 100644
--- a/platform/linux-generic/odp_ipsec.c
+++ b/platform/linux-generic/odp_ipsec.c
@@ -7,6 +7,7 @@ 
 #include "config.h"
 
 #include <odp/api/ipsec.h>
+#include <odp/api/chksum.h>
 
 #include <odp/api/plat/packet_inlines.h>
 
@@ -101,34 +102,6 @@  static odp_ipsec_packet_result_t *ipsec_pkt_result(odp_packet_t packet)
 	return &odp_packet_hdr(packet)->ipsec_ctx;
 }
 
-/**
- * Checksum
- *
- * @param buffer calculate chksum for buffer
- * @param len    buffer length
- *
- * @return checksum value in network order
- */
-static inline
-odp_u16sum_t _odp_chksum(void *buffer, int len)
-{
-	uint16_t *buf = (uint16_t *)buffer;
-	uint32_t sum = 0;
-	uint16_t result;
-
-	for (sum = 0; len > 1; len -= 2)
-		sum += *buf++;
-
-	if (len == 1)
-		sum += *(unsigned char *)buf;
-
-	sum = (sum >> 16) + (sum & 0xFFFF);
-	sum += (sum >> 16);
-	result = ~sum;
-
-	return  (__odp_force odp_u16sum_t) result;
-}
-
 static inline int _odp_ipv4_csum(odp_packet_t pkt,
 				 uint32_t offset,
 				 _odp_ipv4hdr_t *ip,
@@ -148,7 +121,7 @@  static inline int _odp_ipv4_csum(odp_packet_t pkt,
 	if (odp_unlikely(res < 0))
 		return res;
 
-	*chksum = _odp_chksum(buf, nleft);
+	*chksum = ~odp_chksum_ones_comp16(buf, nleft);
 
 	return 0;
 }