net_sched: move tp->root allocation into route4_init()

Cc: Jamal Hadi Salim <jhs@mojatatu.com>
Signed-off-by: Cong Wang <xiyou.wangcong@gmail.com>
Acked-by: Jamal Hadi Salim <jhs@mojatatu.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/net/sched/cls_route.c b/net/sched/cls_route.c
index 2ecd24688554e76e38d98b7338072a37d4c0cea1..bb8a60235d01c90e6de3a433c25559edd070b549 100644 (file)
--- a/net/sched/cls_route.c
+++ b/net/sched/cls_route.c
@@ -258,6 +258,13 @@ static unsigned long route4_get(struct tcf_proto *tp, u32 handle)
 
 static int route4_init(struct tcf_proto *tp)
 {
+       struct route4_head *head;
+
+       head = kzalloc(sizeof(struct route4_head), GFP_KERNEL);
+       if (head == NULL)
+               return -ENOBUFS;
+
+       rcu_assign_pointer(tp->root, head);
        return 0;
 }
 
@@ -484,13 +491,6 @@ static int route4_change(struct net *net, struct sk_buff *in_skb,
                        return -EINVAL;
 
        err = -ENOBUFS;
-       if (head == NULL) {
-               head = kzalloc(sizeof(struct route4_head), GFP_KERNEL);
-               if (head == NULL)
-                       goto errout;
-               rcu_assign_pointer(tp->root, head);
-       }
-
        f = kzalloc(sizeof(struct route4_filter), GFP_KERNEL);
        if (!f)
                goto errout;