Merge branch 'fib_trie-next'

Browse source

Alexander Duyck says:

====================
ipv4/fib_trie: Cleanups to prepare for introduction of key vector

This patch series is meant to mostly just clean up the fib_trie to prepare
it for the introduction of the key_vector.  As such there are a number of
minor clean-ups such as reformatting the tnode to match the format once the
key vector is introduced, some optimizations to drop the need for a leaf
parent pointer, and some changes to remove duplication of effort such as
the 2 look-ups that were essentially being done per node insertion.

v2: Added code to cleanup idx >> n->bits and explain unsigned long logic
    Added code to prevent allocation when tnode size is larger than size_t
====================

Signed-off-by: David S. Miller <davem@davemloft.net>

...

This commit is contained in:

David S. Miller 2015-03-04 23:35:24 -05:00

parent 3a65f63ff6 1de3d87bcd

commit f93eb4ba0f

4 changed files with 433 additions and 368 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

62

include/net/ip_fib.h

View file

7

include/net/netns/ipv4.h

View file

54

net/ipv4/fib_frontend.c

View file

708

net/ipv4/fib_trie.c

View file