net: Move the toeplitz functions from checksum.h to net_rx_pkt.c
PATCH 1/1 net: Move the toeplitz functions from checksum.h to net_rx_pkt.c
The functions are only used in this single .c file, so there is no need to put all this code in a header that is included from multiple places.
--- hw/net/net_rx_pkt.c | 44 ++++++++++++++++++++++++++++++++++++++++++++ include/net/checksum.h | 44 -------------------------------------------- 2 files changed, 44 insertions(+), 44 deletions(-)
hw/net/net_rx_pkt.c +44 -0
@@ -48,6 +48,50 @@ struct NetRxPkt {eth_l4_hdr_info l4hdr_info; }; +typedef struct toeplitz_key_st { +uint32_t leftmost_32_bits; +uint8_t *next_byte; +}net_toeplitz_key ; + +static inline +void net_toeplitz_key_init (net_toeplitz_key *key,uint8_t *key_bytes) +{ + key->leftmost_32_bits =be32_to_cpu (*(uint32_t *)key_bytes); + key->next_byte = key_bytes +sizeof (uint32_t ); +} + +static inline +void net_toeplitz_add (uint32_t *result, +uint8_t *input, +uint32_t len, +net_toeplitz_key *key) +{ + registeruint32_t accumulator = *result; + registeruint32_t leftmost_32_bits = key->leftmost_32_bits; + registeruint32_t byte; + +for (byte =0 ; byte < len; byte++) { + registeruint8_t input_byte = input[byte]; + registeruint8_t key_byte = *(key->next_byte++); + registeruint8_t bit; + +for (bit =0 ; bit <8 ; bit++) { +if (input_byte & (1 <<7 )) { + accumulator ^= leftmost_32_bits; + } + + leftmost_32_bits = + (leftmost_32_bits <<1 ) | ((key_byte & (1 <<7 )) >>7 ); + + input_byte <<=1 ; + key_byte <<=1 ; + } + } + + key->leftmost_32_bits = leftmost_32_bits; + *result = accumulator; +} +void net_rx_pkt_init (struct NetRxPkt **pkt,bool has_virt_hdr) {struct NetRxPkt *p =g_malloc0 (sizeof *p);
include/net/checksum.h +0 -44
48 lines not on this page · raw message
Signature · 1 line
1.8.3.1
Quoted 9 lines · Thomas Huth
The functions are only used in this single .c file, so there is no need to put all this code in a header that is included from multiple places.
Signed-off-by Thomas Huth<[email protected]>--- hw/net/net_rx_pkt.c | 44 ++++++++++++++++++++++++++++++++++++++++++++ include/net/checksum.h | 44 -------------------------------------------- 2 files changed, 44 insertions(+), 44 deletions(-)
Hi Thomas,
We have plan to implement RSS for virtio-net, so it looks like we'd better keep it in the header.
Thanks
Quoted 15 lines · Jason Wang
Quoted 11 lines · Thomas Huth
The functions are only used in this single .c file, so there is no need to put all this code in a header that is included from multiple places.
Signed-off-by Thomas Huth<[email protected]>---
hw/net/net_rx_pkt.c | 44
++++++++++++++++++++++++++++++++++++++++++++
include/net/checksum.h| 44
--------------------------------------------2 files changed, 44 insertions(+), 44 deletions(-)
Quoted 4 lines
Hi Thomas,
We have plan to implement RSS for virtio-net, so it looks like we'd better keep it in the header.
Oh, ok, I didn't know that, so never mind. Then please simply ignore this patch :-)
Thomas