summaryrefslogtreecommitdiff
path: root/net/core/fib_rules.c
diff options
context:
space:
mode:
authorJohn Stultz <john.stultz@linaro.org>2011-10-26 13:48:49 -0700
committerJohn Stultz <john.stultz@linaro.org>2011-10-26 13:48:49 -0700
commit2216773fc021964a413409141d439de4f6a108f7 (patch)
tree7b2f8cdcdf5fb05d75bd92f0c8d9ac635ceec48c /net/core/fib_rules.c
parent42ac8ca89aef66618e8ae2d6e48e3f523bfcd69d (diff)
parentaf1bdb79ca64ceadc7b44b11929b384eff66ce59 (diff)
Merge branch 'upstream/linaro-3.1' into linaro-android-3.1-agreen-rebaselinux-linaro-3.1-2011.10-2-android-0
Diffstat (limited to 'net/core/fib_rules.c')
-rw-r--r--net/core/fib_rules.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/net/core/fib_rules.c b/net/core/fib_rules.c
index 3231b468bb7..27071ee2a4e 100644
--- a/net/core/fib_rules.c
+++ b/net/core/fib_rules.c
@@ -475,8 +475,11 @@ static int fib_nl_delrule(struct sk_buff *skb, struct nlmsghdr* nlh, void *arg)
list_del_rcu(&rule->list);
- if (rule->action == FR_ACT_GOTO)
+ if (rule->action == FR_ACT_GOTO) {
ops->nr_goto_rules--;
+ if (rtnl_dereference(rule->ctarget) == NULL)
+ ops->unresolved_rules--;
+ }
/*
* Check if this rule is a target to any of them. If so,