iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[IPV4]: no need pass pointer to a default into fib_detect_death

Browse Source 
ipv4: no need pass pointer to a default into fib_detect_death

Signed-off-by: Denis V. Lunev <den@openvz.org>
Acked-by: Alexey Kuznetsov <kuznet@ms2.inr.ac.ru>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Denis V. Lunev 2007-12-08 00:22:13 -08:00 committed by David S. Miller
parent 7e5449c215
commit c17860a039
4 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
net/ipv4/fib_hash.c
View File

@ -314,7 +314,7 @@ fn_hash_select_default(struct fib_table *tb, const struct flowi *flp, struct fib
if (next_fi != res->fi) if (next_fi != res->fi)
break; break;
} else if (!fib_detect_death(fi, order, &last_resort, } else if (!fib_detect_death(fi, order, &last_resort,
&last_idx, &fn_hash_last_dflt)) { &last_idx, fn_hash_last_dflt)) {
if (res->fi) if (res->fi)
fib_info_put(res->fi); fib_info_put(res->fi);
res->fi = fi; res->fi = fi;
@ -332,7 +332,7 @@ fn_hash_select_default(struct fib_table *tb, const struct flowi *flp, struct fib
goto out; goto out;
} }
if (!fib_detect_death(fi, order, &last_resort, &last_idx, &fn_hash_last_dflt)) { if (!fib_detect_death(fi, order, &last_resort, &last_idx, fn_hash_last_dflt)) {
if (res->fi) if (res->fi)
fib_info_put(res->fi); fib_info_put(res->fi);
res->fi = fi; res->fi = fi;

2
net/ipv4/fib_lookup.h
View File

@ -36,6 +36,6 @@ extern struct fib_alias *fib_find_alias(struct list_head *fah,
u8 tos, u32 prio); u8 tos, u32 prio);
extern int fib_detect_death(struct fib_info *fi, int order, extern int fib_detect_death(struct fib_info *fi, int order,
struct fib_info **last_resort, struct fib_info **last_resort,
int *last_idx, int *dflt); int *last_idx, int dflt);
#endif /* _FIB_LOOKUP_H */ #endif /* _FIB_LOOKUP_H */

6
net/ipv4/fib_semantics.c
View File

@ -346,7 +346,7 @@ struct fib_alias *fib_find_alias(struct list_head *fah, u8 tos, u32 prio)
} }
int fib_detect_death(struct fib_info *fi, int order, int fib_detect_death(struct fib_info *fi, int order,
struct fib_info **last_resort, int *last_idx, int *dflt) struct fib_info **last_resort, int *last_idx, int dflt)
{ {
struct neighbour *n; struct neighbour *n;
int state = NUD_NONE; int state = NUD_NONE;
@ -358,10 +358,10 @@ int fib_detect_death(struct fib_info *fi, int order,
} }
if (state==NUD_REACHABLE) if (state==NUD_REACHABLE)
return 0; return 0;
if ((state&NUD_VALID) && order != *dflt) if ((state&NUD_VALID) && order != dflt)
return 0; return 0;
if ((state&NUD_VALID) || if ((state&NUD_VALID) ||
(*last_idx<0 && order > *dflt)) { (*last_idx<0 && order > dflt)) {
*last_resort = fi; *last_resort = fi;
*last_idx = order; *last_idx = order;
} }

4
net/ipv4/fib_trie.c
View File

@ -1830,7 +1830,7 @@ fn_trie_select_default(struct fib_table *tb, const struct flowi *flp, struct fib
if (next_fi != res->fi) if (next_fi != res->fi)
break; break;
} else if (!fib_detect_death(fi, order, &last_resort, } else if (!fib_detect_death(fi, order, &last_resort,
&last_idx, &trie_last_dflt)) { &last_idx, trie_last_dflt)) {
if (res->fi) if (res->fi)
fib_info_put(res->fi); fib_info_put(res->fi);
res->fi = fi; res->fi = fi;
@ -1846,7 +1846,7 @@ fn_trie_select_default(struct fib_table *tb, const struct flowi *flp, struct fib
goto out; goto out;
} }
if (!fib_detect_death(fi, order, &last_resort, &last_idx, &trie_last_dflt)) { if (!fib_detect_death(fi, order, &last_resort, &last_idx, trie_last_dflt)) {
if (res->fi) if (res->fi)
fib_info_put(res->fi); fib_info_put(res->fi);
res->fi = fi; res->fi = fi;