aboutsummaryrefslogtreecommitdiffstats
path: root/net/ipv4/fib_trie.c
diff options
context:
space:
mode:
authorAl Viro <viro@zeniv.linux.org.uk>2006-09-27 01:21:45 -0400
committerDavid S. Miller <davem@sunset.davemloft.net>2006-09-28 21:01:14 -0400
commit32ab5f80334fc067386c4c56c434010c01cff6b9 (patch)
treea3cac70ec86e94f90df6a54f251a0893bd98585d /net/ipv4/fib_trie.c
parent1e8aa6f125d959d1a9f16a3f15e9ebbc6df63935 (diff)
[IPV4] fib_trie.c: trivial annotations
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv4/fib_trie.c')
-rw-r--r--net/ipv4/fib_trie.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/net/ipv4/fib_trie.c b/net/ipv4/fib_trie.c
index 9c3ff6ba6e21..d17990ec724f 100644
--- a/net/ipv4/fib_trie.c
+++ b/net/ipv4/fib_trie.c
@@ -1834,7 +1834,7 @@ static int fn_trie_dump_fa(t_key key, int plen, struct list_head *fah, struct fi
1834 int i, s_i; 1834 int i, s_i;
1835 struct fib_alias *fa; 1835 struct fib_alias *fa;
1836 1836
1837 u32 xkey = htonl(key); 1837 __be32 xkey = htonl(key);
1838 1838
1839 s_i = cb->args[4]; 1839 s_i = cb->args[4];
1840 i = 0; 1840 i = 0;
@@ -2281,7 +2281,7 @@ static int fib_trie_seq_show(struct seq_file *seq, void *v)
2281 2281
2282 if (IS_TNODE(n)) { 2282 if (IS_TNODE(n)) {
2283 struct tnode *tn = (struct tnode *) n; 2283 struct tnode *tn = (struct tnode *) n;
2284 t_key prf = ntohl(MASK_PFX(tn->key, tn->pos)); 2284 __be32 prf = htonl(MASK_PFX(tn->key, tn->pos));
2285 2285
2286 if (!NODE_PARENT(n)) { 2286 if (!NODE_PARENT(n)) {
2287 if (iter->trie == trie_local) 2287 if (iter->trie == trie_local)
@@ -2297,7 +2297,7 @@ static int fib_trie_seq_show(struct seq_file *seq, void *v)
2297 } else { 2297 } else {
2298 struct leaf *l = (struct leaf *) n; 2298 struct leaf *l = (struct leaf *) n;
2299 int i; 2299 int i;
2300 u32 val = ntohl(l->key); 2300 __be32 val = htonl(l->key);
2301 2301
2302 seq_indent(seq, iter->depth); 2302 seq_indent(seq, iter->depth);
2303 seq_printf(seq, " |-- %d.%d.%d.%d\n", NIPQUAD(val)); 2303 seq_printf(seq, " |-- %d.%d.%d.%d\n", NIPQUAD(val));
@@ -2360,7 +2360,7 @@ static struct file_operations fib_trie_fops = {
2360 .release = seq_release_private, 2360 .release = seq_release_private,
2361}; 2361};
2362 2362
2363static unsigned fib_flag_trans(int type, u32 mask, const struct fib_info *fi) 2363static unsigned fib_flag_trans(int type, __be32 mask, const struct fib_info *fi)
2364{ 2364{
2365 static unsigned type2flags[RTN_MAX + 1] = { 2365 static unsigned type2flags[RTN_MAX + 1] = {
2366 [7] = RTF_REJECT, [8] = RTF_REJECT, 2366 [7] = RTF_REJECT, [8] = RTF_REJECT,
@@ -2369,7 +2369,7 @@ static unsigned fib_flag_trans(int type, u32 mask, const struct fib_info *fi)
2369 2369
2370 if (fi && fi->fib_nh->nh_gw) 2370 if (fi && fi->fib_nh->nh_gw)
2371 flags |= RTF_GATEWAY; 2371 flags |= RTF_GATEWAY;
2372 if (mask == 0xFFFFFFFF) 2372 if (mask == htonl(0xFFFFFFFF))
2373 flags |= RTF_HOST; 2373 flags |= RTF_HOST;
2374 flags |= RTF_UP; 2374 flags |= RTF_UP;
2375 return flags; 2375 return flags;
@@ -2403,7 +2403,7 @@ static int fib_route_seq_show(struct seq_file *seq, void *v)
2403 for (i=32; i>=0; i--) { 2403 for (i=32; i>=0; i--) {
2404 struct leaf_info *li = find_leaf_info(l, i); 2404 struct leaf_info *li = find_leaf_info(l, i);
2405 struct fib_alias *fa; 2405 struct fib_alias *fa;
2406 u32 mask, prefix; 2406 __be32 mask, prefix;
2407 2407
2408 if (!li) 2408 if (!li)
2409 continue; 2409 continue;