diff --git a/[refs] b/[refs] index 742edc1b3f21..38d1ddafbbc0 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 2db82b534bd52b349f1b2ab3e63aa40ca0e466ab +refs/heads/master: 72132c1b6c7a7605cdfde86a9f58b6ca2b2195a6 diff --git a/trunk/include/net/fib_rules.h b/trunk/include/net/fib_rules.h index e9a074cf59ed..4f472507129e 100644 --- a/trunk/include/net/fib_rules.h +++ b/trunk/include/net/fib_rules.h @@ -102,7 +102,7 @@ static inline u32 frh_get_table(struct fib_rule_hdr *frh, struct nlattr **nla) } extern int fib_rules_register(struct net *, struct fib_rules_ops *); -extern int fib_rules_unregister(struct net *, struct fib_rules_ops *); +extern void fib_rules_unregister(struct net *, struct fib_rules_ops *); extern void fib_rules_cleanup_ops(struct fib_rules_ops *); extern int fib_rules_lookup(struct fib_rules_ops *, diff --git a/trunk/net/core/fib_rules.c b/trunk/net/core/fib_rules.c index c5f78fed6885..541728aa2bae 100644 --- a/trunk/net/core/fib_rules.c +++ b/trunk/net/core/fib_rules.c @@ -112,29 +112,16 @@ void fib_rules_cleanup_ops(struct fib_rules_ops *ops) } EXPORT_SYMBOL_GPL(fib_rules_cleanup_ops); -int fib_rules_unregister(struct net *net, struct fib_rules_ops *ops) +void fib_rules_unregister(struct net *net, struct fib_rules_ops *ops) { - int err = 0; - struct fib_rules_ops *o; spin_lock(&net->rules_mod_lock); - list_for_each_entry(o, &net->rules_ops, list) { - if (o == ops) { - list_del_rcu(&o->list); - fib_rules_cleanup_ops(ops); - goto out; - } - } - - err = -ENOENT; -out: + list_del_rcu(&ops->list); + fib_rules_cleanup_ops(ops); spin_unlock(&net->rules_mod_lock); synchronize_rcu(); - if (!err) - release_net(net); - - return err; + release_net(net); } EXPORT_SYMBOL_GPL(fib_rules_unregister);