From: David S. Miller Date: Thu, 5 Mar 2015 04:35:24 +0000 (-0500) Subject: Merge branch 'fib_trie-next' X-Git-Tag: omap-for-v4.1/fixes-rc1~141^2~344 X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f93eb4ba0f6c089252c8358563b5859a4daf40b1;p=pandora-kernel.git Merge branch 'fib_trie-next' 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 --- f93eb4ba0f6c089252c8358563b5859a4daf40b1