Commit ab66b4a7 authored by Stephen Hemminger's avatar Stephen Hemminger Committed by David S. Miller
Browse files

[IPV4] fib_trie: macro cleanup 



This patch converts the messy macro for MASK_PFX to inline function
and expands TKEY_GET_MASK in the one place it is used.

Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 06801916

net/ipv4/fib_trie.c

+11 −7
Original line number Diff line number Diff line
@@ -85,8 +85,6 @@ 
#define MAX_STAT_DEPTH 32



#define KEYLENGTH (8*sizeof(t_key))

#define MASK_PFX(k, l) (((l)==0)?0:(k >> (KEYLENGTH-l)) << (KEYLENGTH-l))

#define TKEY_GET_MASK(offset, bits) (((bits)==0)?0:((t_key)(-1) << (KEYLENGTH - bits) >> offset))



typedef unsigned int t_key;
@@ -195,6 +193,11 @@ static inline int tnode_child_length(const struct tnode *tn) 
	return 1 << tn->bits;

}



static inline t_key mask_pfx(t_key k, unsigned short l)

{

	return (l == 0) ? 0 : k >> (KEYLENGTH-l) << (KEYLENGTH-l);

}



static inline t_key tkey_extract_bits(t_key a, int offset, int bits)

{

	if (offset < KEYLENGTH)
@@ -679,7 +682,7 @@ static struct tnode *inflate(struct trie *t, struct tnode *tn) 
		    inode->pos == oldtnode->pos + oldtnode->bits &&

		    inode->bits > 1) {

			struct tnode *left, *right;

			t_key m = TKEY_GET_MASK(inode->pos, 1);

			t_key m = ~0U << (KEYLENGTH - 1) >> inode->pos;



			left = tnode_new(inode->key&(~m), inode->pos + 1,

					 inode->bits - 1);
@@ -1367,7 +1370,8 @@ fn_trie_lookup(struct fib_table *tb, const struct flowi *flp, struct fib_result 
		bits = pn->bits;



		if (!chopped_off)

			cindex = tkey_extract_bits(MASK_PFX(key, current_prefix_length), pos, bits);

			cindex = tkey_extract_bits(mask_pfx(key, current_prefix_length),

						   pos, bits);



		n = tnode_get_child(pn, cindex);
@@ -1453,8 +1457,8 @@ fn_trie_lookup(struct fib_table *tb, const struct flowi *flp, struct fib_result 
		 * to find a matching prefix.

		 */



		node_prefix = MASK_PFX(cn->key, cn->pos);

		key_prefix = MASK_PFX(key, cn->pos);

		node_prefix = mask_pfx(cn->key, cn->pos);

		key_prefix = mask_pfx(key, cn->pos);

		pref_mismatch = key_prefix^node_prefix;

		mp = 0;
@@ -2330,7 +2334,7 @@ static int fib_trie_seq_show(struct seq_file *seq, void *v) 


	if (IS_TNODE(n)) {

		struct tnode *tn = (struct tnode *) n;

		__be32 prf = htonl(MASK_PFX(tn->key, tn->pos));

		__be32 prf = htonl(mask_pfx(tn->key, tn->pos));



		seq_indent(seq, iter->depth-1);

		seq_printf(seq, "  +-- %d.%d.%d.%d/%d %d %d %d\n",