Changeset 5876154 for lib/hash_toeplitz.c

Timestamp:

06/23/14 23:36:31 (8 years ago)

Author:

Richard Sanger <rsangerarj@…>

Branches:

4.0.1-hotfixes, cachetimestamps, develop, dpdk-ndag, etsilive, libtrace4, master, ndag_format, pfring, rc-4.0.1, rc-4.0.2, rc-4.0.3, rc-4.0.4, ringdecrementfix, ringperformance, ringtimestampfixes

Children:

10e183f

Parents:

8c42377 (diff), 5ba34eb (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'MergingUpstream?' into develop

File:

• lib/hash_toeplitz.c (modified) (3 diffs)

lib/hash_toeplitz.c

@@ -70 +70 @@
 }
 
-inline void toeplitz_init_config(toeplitz_conf_t *conf, bool bidirectional)
+void toeplitz_init_config(toeplitz_conf_t *conf, bool bidirectional)
 {
         if (bidirectional) {
@@ -83 +83 @@
  * n is bits
  */
-inline uint32_t toeplitz_hash(const toeplitz_conf_t *tc, const uint8_t *data, size_t offset, size_t n, uint32_t result)
+uint32_t toeplitz_hash(const toeplitz_conf_t *tc, const uint8_t *data, size_t offset, size_t n, uint32_t result)
 {
         size_t byte;
@@ -97 +97 @@
 }
 
-inline uint32_t toeplitz_first_hash(const toeplitz_conf_t *tc, const uint8_t *data, size_t n)
+uint32_t toeplitz_first_hash(const toeplitz_conf_t *tc, const uint8_t *data, size_t n)
 {
         return toeplitz_hash(tc, data, 0, n, 0);
 }
 
-inline uint64_t toeplitz_hash_packet(const libtrace_packet_t * pkt, const toeplitz_conf_t *cnf) {
+uint64_t toeplitz_hash_packet(const libtrace_packet_t * pkt, const toeplitz_conf_t *cnf) {
         uint8_t proto;
         uint16_t eth_type;