Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

[platform/kernel/linux-rpi.git] / net / sched / act_api.c

diff --git a/net/sched/act_api.c b/net/sched/act_api.c
index c67b820..ff4d690 100644 (file)
--- a/net/sched/act_api.c
+++ b/net/sched/act_api.c
@@ -80,6 +80,7 @@ static void tcf_idr_remove(struct tcf_idrinfo *idrinfo, struct tc_action *p)
        spin_lock_bh(&idrinfo->lock);
        idr_remove_ext(&idrinfo->action_idr, p->tcfa_index);
        spin_unlock_bh(&idrinfo->lock);
+       put_net(idrinfo->net);
        gen_kill_estimator(&p->tcfa_rate_est);
        free_tcf(p);
 }
@@ -88,6 +89,8 @@ int __tcf_idr_release(struct tc_action *p, bool bind, bool strict)
 {
        int ret = 0;
 
+       ASSERT_RTNL();
+
        if (p) {
                if (bind)
                        p->tcfa_bindcnt--;
@@ -336,6 +339,7 @@ err3:
        p->idrinfo = idrinfo;
        p->ops = ops;
        INIT_LIST_HEAD(&p->list);
+       get_net(idrinfo->net);
        *a = p;
        return 0;
 }