On Wed, 2007-04-18 at 16:06 +0200, Patrick McHardy wrote:
> Milan Kocián wrote:
> > On Tue, 2007-04-17 at 14:58 +0200, Patrick McHardy wrote:
> >
> >>Milan, could you cook up another patch which uses NLM_F_REPLACE?
> >
> >
> > I can try it. Output is in patch below. Review carefully. I don't know
> > if it's best approach. It's tested and working without problem
> > (probably :-))
>
>
> Looks good, but your mailer corrupted long lines. Please resend as
> attachment and sign off the patch.
>
ok, here is new version. Sign is in patch. Is it correct?
--
Milan Kocián <[EMAIL PROTECTED]>
--- a/net/ipv4/fib_hash.c 2007-04-18 12:50:11.000000000 +0200
+++ b/net/ipv4/fib_hash.c 2007-04-19 10:21:04.267136960 +0200
@@ -457,6 +457,8 @@
fib_release_info(fi_drop);
if (state & FA_S_ACCESSED)
rt_cache_flush(-1);
+ rtmsg_fib(RTM_NEWROUTE, key, fa, cfg->fc_dst_len, tb->tb_id,
+ &cfg->fc_nlinfo, NLM_F_REPLACE);
return 0;
}
@@ -524,7 +526,7 @@
rt_cache_flush(-1);
rtmsg_fib(RTM_NEWROUTE, key, new_fa, cfg->fc_dst_len, tb->tb_id,
- &cfg->fc_nlinfo);
+ &cfg->fc_nlinfo, 0);
return 0;
out_free_new_fa:
@@ -590,7 +592,7 @@
fa = fa_to_delete;
rtmsg_fib(RTM_DELROUTE, key, fa, cfg->fc_dst_len,
- tb->tb_id, &cfg->fc_nlinfo);
+ tb->tb_id, &cfg->fc_nlinfo, 0);
kill_fn = 0;
write_lock_bh(&fib_hash_lock);
--- a/net/ipv4/fib_trie.c 2007-04-18 12:50:11.000000000 +0200
+++ b/net/ipv4/fib_trie.c 2007-04-19 11:41:14.537864656 +0200
@@ -1205,6 +1205,8 @@
fib_release_info(fi_drop);
if (state & FA_S_ACCESSED)
rt_cache_flush(-1);
+ rtmsg_fib(RTM_NEWROUTE, htonl(key), new_fa, plen, tb->tb_id,
+ &cfg->fc_nlinfo, NLM_F_REPLACE);
goto succeeded;
}
/* Error if we find a perfect match which
@@ -1256,7 +1258,7 @@
rt_cache_flush(-1);
rtmsg_fib(RTM_NEWROUTE, htonl(key), new_fa, plen, tb->tb_id,
- &cfg->fc_nlinfo);
+ &cfg->fc_nlinfo, 0);
succeeded:
return 0;
@@ -1599,7 +1601,7 @@
fa = fa_to_delete;
rtmsg_fib(RTM_DELROUTE, htonl(key), fa, plen, tb->tb_id,
- &cfg->fc_nlinfo);
+ &cfg->fc_nlinfo, 0);
l = fib_find_node(t, key);
li = find_leaf_info(l, plen);
--- a/net/ipv4/fib_semantics.c 2007-04-18 12:50:11.000000000 +0200
+++ b/net/ipv4/fib_semantics.c 2007-04-19 10:22:06.852622520 +0200
@@ -301,7 +301,8 @@
}
void rtmsg_fib(int event, __be32 key, struct fib_alias *fa,
- int dst_len, u32 tb_id, struct nl_info *info)
+ int dst_len, u32 tb_id, struct nl_info *info,
+ unsigned int nlm_flags)
{
struct sk_buff *skb;
u32 seq = info->nlh ? info->nlh->nlmsg_seq : 0;
@@ -313,7 +314,7 @@
err = fib_dump_info(skb, info->pid, seq, event, tb_id,
fa->fa_type, fa->fa_scope, key, dst_len,
- fa->fa_tos, fa->fa_info, 0);
+ fa->fa_tos, fa->fa_info, nlm_flags);
/* failure implies BUG in fib_nlmsg_size() */
BUG_ON(err < 0);
--- a/net/ipv4/fib_lookup.h 2007-04-18 12:50:11.000000000 +0200
+++ b/net/ipv4/fib_lookup.h 2007-04-19 10:23:11.637773680 +0200
@@ -30,7 +30,8 @@
int dst_len, u8 tos, struct fib_info *fi,
unsigned int);
extern void rtmsg_fib(int event, __be32 key, struct fib_alias *fa,
- int dst_len, u32 tb_id, struct nl_info *info);
+ int dst_len, u32 tb_id, struct nl_info *info,
+ unsigned int nlm_flags);
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,
Signed-off-by: Milan Kocian <[EMAIL PROTECTED]>
