cfg80211: allow survey data to return global data
[deliverable/linux.git] / net / sched / cls_cgroup.c
index dbee65e26b3ed44e000f884234de302c14c65bb0..221697ab0247c5e786c70e181a43c1145a30748b 100644 (file)
@@ -67,10 +67,6 @@ static unsigned long cls_cgroup_get(struct tcf_proto *tp, u32 handle)
        return 0UL;
 }
 
-static void cls_cgroup_put(struct tcf_proto *tp, unsigned long f)
-{
-}
-
 static int cls_cgroup_init(struct tcf_proto *tp)
 {
        return 0;
@@ -181,7 +177,6 @@ static int cls_cgroup_dump(struct net *net, struct tcf_proto *tp, unsigned long
                           struct sk_buff *skb, struct tcmsg *t)
 {
        struct cls_cgroup_head *head = rtnl_dereference(tp->root);
-       unsigned char *b = skb_tail_pointer(skb);
        struct nlattr *nest;
 
        t->tcm_handle = head->handle;
@@ -202,7 +197,7 @@ static int cls_cgroup_dump(struct net *net, struct tcf_proto *tp, unsigned long
        return skb->len;
 
 nla_put_failure:
-       nlmsg_trim(skb, b);
+       nla_nest_cancel(skb, nest);
        return -1;
 }
 
@@ -213,7 +208,6 @@ static struct tcf_proto_ops cls_cgroup_ops __read_mostly = {
        .classify       =       cls_cgroup_classify,
        .destroy        =       cls_cgroup_destroy,
        .get            =       cls_cgroup_get,
-       .put            =       cls_cgroup_put,
        .delete         =       cls_cgroup_delete,
        .walk           =       cls_cgroup_walk,
        .dump           =       cls_cgroup_dump,
This page took 0.031064 seconds and 5 git commands to generate.