From fc788a4e5489eaedf91ef62dcf8df2382278efac Mon Sep 17 00:00:00 2001 From: Julian Anastasov Date: Sat, 19 Mar 2011 12:13:46 +0000 Subject: [PATCH] --- yaml --- r: 242607 b: refs/heads/master c: 74cb3c108bc0f599a4eb40980db8580cfba725c9 h: refs/heads/master i: 242605: cba9bb2a3ce43b4bb78916bda52b52d834d477ec 242603: a81741a729b378ab91f2f3bb0379ab242dad6b2c 242599: 4f54290a87442b5ffbf65195336f6e3094e72cd9 242591: 12b4b44375f5a1b57a1cdfc6f1e90f5256d915f9 v: v3 --- [refs] | 2 +- trunk/net/ipv4/fib_trie.c | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 31119af8d2b8..54f879693e56 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 3c0f3c605b2572c740f66ea39fe2d125399b20aa +refs/heads/master: 74cb3c108bc0f599a4eb40980db8580cfba725c9 diff --git a/trunk/net/ipv4/fib_trie.c b/trunk/net/ipv4/fib_trie.c index 3d28a35c2e1a..ac87a49ad50b 100644 --- a/trunk/net/ipv4/fib_trie.c +++ b/trunk/net/ipv4/fib_trie.c @@ -1665,6 +1665,8 @@ int fib_table_delete(struct fib_table *tb, struct fib_config *cfg) if ((!cfg->fc_type || fa->fa_type == cfg->fc_type) && (cfg->fc_scope == RT_SCOPE_NOWHERE || fa->fa_scope == cfg->fc_scope) && + (!cfg->fc_prefsrc || + fi->fib_prefsrc == cfg->fc_prefsrc) && (!cfg->fc_protocol || fi->fib_protocol == cfg->fc_protocol) && fib_nh_match(cfg, fi) == 0) {