Ignore:
Timestamp:
06/23/14 23:36:31 (7 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:
1 edited

Legend:

Unmodified
Added
Removed
  • lib/hash_toeplitz.h

    r29bbef0 r5ba34eb  
    2828
    2929void toeplitz_hash_expand_key(toeplitz_conf_t *conf);
    30 inline uint32_t toeplitz_hash(const toeplitz_conf_t *tc, const uint8_t *data, size_t offset, size_t n, uint32_t result);
    31 inline uint32_t toeplitz_first_hash(const toeplitz_conf_t *tc, const uint8_t *data, size_t n);
    32 inline void toeplitz_init_config(toeplitz_conf_t *conf, bool bidirectional);
    33 inline uint64_t toeplitz_hash_packet(const libtrace_packet_t * pkt, const toeplitz_conf_t *cnf);
     30uint32_t toeplitz_hash(const toeplitz_conf_t *tc, const uint8_t *data, size_t offset, size_t n, uint32_t result);
     31uint32_t toeplitz_first_hash(const toeplitz_conf_t *tc, const uint8_t *data, size_t n);
     32void toeplitz_init_config(toeplitz_conf_t *conf, bool bidirectional);
     33uint64_t toeplitz_hash_packet(const libtrace_packet_t * pkt, const toeplitz_conf_t *cnf);
    3434void toeplitz_create_bikey(uint8_t *key);
    3535void toeplitz_create_unikey(uint8_t *key);
     
    4747#pragma pack(pop)   /* restore original alignment from stack */
    4848
    49 
    50 inline toeplitz_ipv4_only_t make_toeplitz_ipv4(uint8_t *src_ip4, uint8_t *dest_ip4);
    51 
    5249#endif
Note: See TracChangeset for help on using the changeset viewer.