From 1e066431a45a67321abcd134e888205fc633bd41 Mon Sep 17 00:00:00 2001 From: Michael Brown Date: Wed, 4 May 2016 13:30:37 +0100 Subject: [tcpip] Do not fall back to using unoptimised TCP/IP checksumming Require architecture-specific code to make a deliberate choice to use the unoptimised generic_tcpip_continue_chksum() function, if there is no optimised version available. Signed-off-by: Michael Brown --- src/arch/x86/core/x86_tcpip.c | 4 ++-- src/arch/x86/include/bits/tcpip.h | 6 ++---- 2 files changed, 4 insertions(+), 6 deletions(-) (limited to 'src/arch') diff --git a/src/arch/x86/core/x86_tcpip.c b/src/arch/x86/core/x86_tcpip.c index 88042f5f7..ed323d5d0 100644 --- a/src/arch/x86/core/x86_tcpip.c +++ b/src/arch/x86/core/x86_tcpip.c @@ -42,8 +42,8 @@ extern char x86_tcpip_loop_end[]; * @v len Length of data buffer * @ret cksum Updated checksum, in network byte order */ -uint16_t x86_tcpip_continue_chksum ( uint16_t partial, - const void *data, size_t len ) { +uint16_t tcpip_continue_chksum ( uint16_t partial, const void *data, + size_t len ) { unsigned long sum = ( ( ~partial ) & 0xffff ); unsigned long initial_word_count; unsigned long loop_count; diff --git a/src/arch/x86/include/bits/tcpip.h b/src/arch/x86/include/bits/tcpip.h index 5c2baffcf..0ac55b1a0 100644 --- a/src/arch/x86/include/bits/tcpip.h +++ b/src/arch/x86/include/bits/tcpip.h @@ -9,9 +9,7 @@ FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL ); -extern uint16_t x86_tcpip_continue_chksum ( uint16_t partial, - const void *data, size_t len ); - -#define tcpip_continue_chksum x86_tcpip_continue_chksum +extern uint16_t tcpip_continue_chksum ( uint16_t partial, const void *data, + size_t len ); #endif /* _BITS_TCPIP_H */ -- cgit v1.2.3-55-g7522