* FIB reorg (3)
@ 2004-11-24 19:19 Robert Olsson
2004-12-01 6:16 ` David S. Miller
0 siblings, 1 reply; 2+ messages in thread
From: Robert Olsson @ 2004-11-24 19:19 UTC (permalink / raw)
To: David S. Miller; +Cc: Robert.Olsson, netdev
And also fib_detect_death.
--ro
--- net/ipv4/fib_hash.c.041118 Thu Nov 18 20:09:55 2004
+++ net/ipv4/fib_hash.c Thu Nov 18 20:36:00 2004
@@ -49,6 +49,9 @@
static kmem_cache_t *fn_alias_kmem;
extern struct fib_alias *fib_find_alias(struct list_head *fah, u8 tos, u32 prio);
+extern int fib_detect_death(struct fib_info *fi, int order,
+ struct fib_info **last_resort, int *last_idx, int *dflt);
+
struct fib_node {
struct hlist_node fn_hash;
@@ -276,29 +279,6 @@
static int fn_hash_last_dflt=-1;
-static int fib_detect_death(struct fib_info *fi, int order,
- struct fib_info **last_resort, int *last_idx)
-{
- struct neighbour *n;
- int state = NUD_NONE;
-
- n = neigh_lookup(&arp_tbl, &fi->fib_nh[0].nh_gw, fi->fib_dev);
- if (n) {
- state = n->nud_state;
- neigh_release(n);
- }
- if (state==NUD_REACHABLE)
- return 0;
- if ((state&NUD_VALID) && order != fn_hash_last_dflt)
- return 0;
- if ((state&NUD_VALID) ||
- (*last_idx<0 && order > fn_hash_last_dflt)) {
- *last_resort = fi;
- *last_idx = order;
- }
- return 1;
-}
-
static void
fn_hash_select_default(struct fib_table *tb, const struct flowi *flp, struct fib_result *res)
{
@@ -339,7 +319,7 @@
if (next_fi != res->fi)
break;
} else if (!fib_detect_death(fi, order, &last_resort,
- &last_idx)) {
+ &last_idx, &fn_hash_last_dflt)) {
if (res->fi)
fib_info_put(res->fi);
res->fi = fi;
@@ -357,7 +337,7 @@
goto out;
}
- if (!fib_detect_death(fi, order, &last_resort, &last_idx)) {
+ if (!fib_detect_death(fi, order, &last_resort, &last_idx, &fn_hash_last_dflt)) {
if (res->fi)
fib_info_put(res->fi);
res->fi = fi;
--- net/ipv4/fib_semantics.c.041118 Thu Nov 18 20:26:02 2004
+++ net/ipv4/fib_semantics.c Thu Nov 18 20:18:00 2004
@@ -317,6 +317,30 @@
}
+int fib_detect_death(struct fib_info *fi, int order,
+ struct fib_info **last_resort, int *last_idx, int *dflt)
+{
+ struct neighbour *n;
+ int state = NUD_NONE;
+
+ n = neigh_lookup(&arp_tbl, &fi->fib_nh[0].nh_gw, fi->fib_dev);
+ if (n) {
+ state = n->nud_state;
+ neigh_release(n);
+ }
+ if (state==NUD_REACHABLE)
+ return 0;
+ if ((state&NUD_VALID) && order != *dflt)
+ return 0;
+ if ((state&NUD_VALID) ||
+ (*last_idx<0 && order > *dflt)) {
+ *last_resort = fi;
+ *last_idx = order;
+ }
+ return 1;
+}
+
+
#ifdef CONFIG_IP_ROUTE_MULTIPATH
static u32 fib_get_attr32(struct rtattr *attr, int attrlen, int type)
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: FIB reorg (3)
2004-11-24 19:19 FIB reorg (3) Robert Olsson
@ 2004-12-01 6:16 ` David S. Miller
0 siblings, 0 replies; 2+ messages in thread
From: David S. Miller @ 2004-12-01 6:16 UTC (permalink / raw)
To: Robert Olsson; +Cc: Robert.Olsson, netdev
On Wed, 24 Nov 2004 20:19:09 +0100
Robert Olsson <Robert.Olsson@data.slu.se> wrote:
> And also fib_detect_death.
Also applied to my 2.6.11 pending tree with the
fib_lookup.h usage fixup.
Thanks Robert.
# This is a BitKeeper generated diff -Nru style patch.
#
# ChangeSet
# 2004/11/30 21:51:06-08:00 robert.olsson@data.slu.se
# [IPV4]: FIB cleanup, fib_detect_death()
#
# Remove dependancy upon fib_hash specific
# fn_hash_select_dflt and move it over to
# fib_semantics.c
#
# Signed-off-by: David S. Miller <davem@davemloft.net>
#
# net/ipv4/fib_semantics.c
# 2004/11/30 21:50:04-08:00 robert.olsson@data.slu.se +23 -0
# [IPV4]: FIB cleanup, fib_detect_death()
#
# net/ipv4/fib_lookup.h
# 2004/11/30 21:50:04-08:00 robert.olsson@data.slu.se +3 -0
# [IPV4]: FIB cleanup, fib_detect_death()
#
# net/ipv4/fib_hash.c
# 2004/11/30 21:50:04-08:00 robert.olsson@data.slu.se +2 -25
# [IPV4]: FIB cleanup, fib_detect_death()
#
diff -Nru a/net/ipv4/fib_hash.c b/net/ipv4/fib_hash.c
--- a/net/ipv4/fib_hash.c 2004-11-30 21:51:41 -08:00
+++ b/net/ipv4/fib_hash.c 2004-11-30 21:51:41 -08:00
@@ -274,29 +274,6 @@
static int fn_hash_last_dflt=-1;
-static int fib_detect_death(struct fib_info *fi, int order,
- struct fib_info **last_resort, int *last_idx)
-{
- struct neighbour *n;
- int state = NUD_NONE;
-
- n = neigh_lookup(&arp_tbl, &fi->fib_nh[0].nh_gw, fi->fib_dev);
- if (n) {
- state = n->nud_state;
- neigh_release(n);
- }
- if (state==NUD_REACHABLE)
- return 0;
- if ((state&NUD_VALID) && order != fn_hash_last_dflt)
- return 0;
- if ((state&NUD_VALID) ||
- (*last_idx<0 && order > fn_hash_last_dflt)) {
- *last_resort = fi;
- *last_idx = order;
- }
- return 1;
-}
-
static void
fn_hash_select_default(struct fib_table *tb, const struct flowi *flp, struct fib_result *res)
{
@@ -337,7 +314,7 @@
if (next_fi != res->fi)
break;
} else if (!fib_detect_death(fi, order, &last_resort,
- &last_idx)) {
+ &last_idx, &fn_hash_last_dflt)) {
if (res->fi)
fib_info_put(res->fi);
res->fi = fi;
@@ -355,7 +332,7 @@
goto out;
}
- if (!fib_detect_death(fi, order, &last_resort, &last_idx)) {
+ if (!fib_detect_death(fi, order, &last_resort, &last_idx, &fn_hash_last_dflt)) {
if (res->fi)
fib_info_put(res->fi);
res->fi = fi;
diff -Nru a/net/ipv4/fib_lookup.h b/net/ipv4/fib_lookup.h
--- a/net/ipv4/fib_lookup.h 2004-11-30 21:51:41 -08:00
+++ b/net/ipv4/fib_lookup.h 2004-11-30 21:51:41 -08:00
@@ -35,5 +35,8 @@
struct nlmsghdr *n, struct netlink_skb_parms *req);
extern struct fib_alias *fib_find_alias(struct list_head *fah,
u8 tos, u32 prio);
+extern int fib_detect_death(struct fib_info *fi, int order,
+ struct fib_info **last_resort,
+ int *last_idx, int *dflt);
#endif /* _FIB_LOOKUP_H */
diff -Nru a/net/ipv4/fib_semantics.c b/net/ipv4/fib_semantics.c
--- a/net/ipv4/fib_semantics.c 2004-11-30 21:51:41 -08:00
+++ b/net/ipv4/fib_semantics.c 2004-11-30 21:51:41 -08:00
@@ -315,6 +315,29 @@
return NULL;
}
+int fib_detect_death(struct fib_info *fi, int order,
+ struct fib_info **last_resort, int *last_idx, int *dflt)
+{
+ struct neighbour *n;
+ int state = NUD_NONE;
+
+ n = neigh_lookup(&arp_tbl, &fi->fib_nh[0].nh_gw, fi->fib_dev);
+ if (n) {
+ state = n->nud_state;
+ neigh_release(n);
+ }
+ if (state==NUD_REACHABLE)
+ return 0;
+ if ((state&NUD_VALID) && order != *dflt)
+ return 0;
+ if ((state&NUD_VALID) ||
+ (*last_idx<0 && order > *dflt)) {
+ *last_resort = fi;
+ *last_idx = order;
+ }
+ return 1;
+}
+
#ifdef CONFIG_IP_ROUTE_MULTIPATH
static u32 fib_get_attr32(struct rtattr *attr, int attrlen, int type)
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2004-12-01 6:16 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2004-11-24 19:19 FIB reorg (3) Robert Olsson
2004-12-01 6:16 ` David S. Miller
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).