diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2011-10-07 23:07:41 +0200 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2011-10-07 23:07:41 +0200 |
| commit | 8efc59ad6764ade520012cb192cd484e5191cd9c (patch) | |
| tree | d2465d91ebb2652e35cd08f715fc202b3f9e042a /net/core/fib_rules.c | |
| parent | 6f6184a9d01880a3e21349544f73b3720ce5e152 (diff) | |
| parent | 492c4a0df11573e141a2decc6012b3bddd14a11e (diff) | |
Merge branch 'sirf/cleanup' into next/cleanup
Diffstat (limited to 'net/core/fib_rules.c')
| -rw-r--r-- | net/core/fib_rules.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/core/fib_rules.c b/net/core/fib_rules.c index e7ab0c0285b..3231b468bb7 100644 --- a/net/core/fib_rules.c +++ b/net/core/fib_rules.c @@ -384,8 +384,8 @@ static int fib_nl_newrule(struct sk_buff *skb, struct nlmsghdr* nlh, void *arg) */ list_for_each_entry(r, &ops->rules_list, list) { if (r->action == FR_ACT_GOTO && - r->target == rule->pref) { - BUG_ON(rtnl_dereference(r->ctarget) != NULL); + r->target == rule->pref && + rtnl_dereference(r->ctarget) == NULL) { rcu_assign_pointer(r->ctarget, rule); if (--ops->unresolved_rules == 0) break; |