diff options
author | Jiri Pirko <jiri@resnulli.us> | 2014-12-04 15:41:18 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2014-12-09 14:49:02 -0500 |
commit | 57d743a3dec174b8f1fbf53e93ade2fea3d32bd7 (patch) | |
tree | bbed00c734c48eed21e60a5100ff117406433571 /net/sched | |
parent | 02dc4025a088ea7ff53fcb35ba9e0f295078a4a0 (diff) |
net: sched: cls: remove unused op put from tcf_proto_ops
It is never called and implementations are void. So just remove it.
Signed-off-by: Jiri Pirko <jiri@resnulli.us>
Signed-off-by: Jamal Hadi Salim <jhs@mojatatu.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/sched')
-rw-r--r-- | net/sched/cls_basic.c | 5 | ||||
-rw-r--r-- | net/sched/cls_bpf.c | 5 | ||||
-rw-r--r-- | net/sched/cls_cgroup.c | 5 | ||||
-rw-r--r-- | net/sched/cls_flow.c | 5 | ||||
-rw-r--r-- | net/sched/cls_fw.c | 5 | ||||
-rw-r--r-- | net/sched/cls_route.c | 5 | ||||
-rw-r--r-- | net/sched/cls_rsvp.h | 5 | ||||
-rw-r--r-- | net/sched/cls_tcindex.c | 8 | ||||
-rw-r--r-- | net/sched/cls_u32.c | 5 |
9 files changed, 0 insertions, 48 deletions
diff --git a/net/sched/cls_basic.c b/net/sched/cls_basic.c index 1c122c7e0549..7cf0a62fc4c9 100644 --- a/net/sched/cls_basic.c +++ b/net/sched/cls_basic.c | |||
@@ -72,10 +72,6 @@ static unsigned long basic_get(struct tcf_proto *tp, u32 handle) | |||
72 | return l; | 72 | return l; |
73 | } | 73 | } |
74 | 74 | ||
75 | static void basic_put(struct tcf_proto *tp, unsigned long f) | ||
76 | { | ||
77 | } | ||
78 | |||
79 | static int basic_init(struct tcf_proto *tp) | 75 | static int basic_init(struct tcf_proto *tp) |
80 | { | 76 | { |
81 | struct basic_head *head; | 77 | struct basic_head *head; |
@@ -287,7 +283,6 @@ static struct tcf_proto_ops cls_basic_ops __read_mostly = { | |||
287 | .init = basic_init, | 283 | .init = basic_init, |
288 | .destroy = basic_destroy, | 284 | .destroy = basic_destroy, |
289 | .get = basic_get, | 285 | .get = basic_get, |
290 | .put = basic_put, | ||
291 | .change = basic_change, | 286 | .change = basic_change, |
292 | .delete = basic_delete, | 287 | .delete = basic_delete, |
293 | .walk = basic_walk, | 288 | .walk = basic_walk, |
diff --git a/net/sched/cls_bpf.c b/net/sched/cls_bpf.c index d0de979c04a3..84c8219c3e1c 100644 --- a/net/sched/cls_bpf.c +++ b/net/sched/cls_bpf.c | |||
@@ -151,10 +151,6 @@ static unsigned long cls_bpf_get(struct tcf_proto *tp, u32 handle) | |||
151 | return ret; | 151 | return ret; |
152 | } | 152 | } |
153 | 153 | ||
154 | static void cls_bpf_put(struct tcf_proto *tp, unsigned long f) | ||
155 | { | ||
156 | } | ||
157 | |||
158 | static int cls_bpf_modify_existing(struct net *net, struct tcf_proto *tp, | 154 | static int cls_bpf_modify_existing(struct net *net, struct tcf_proto *tp, |
159 | struct cls_bpf_prog *prog, | 155 | struct cls_bpf_prog *prog, |
160 | unsigned long base, struct nlattr **tb, | 156 | unsigned long base, struct nlattr **tb, |
@@ -356,7 +352,6 @@ static struct tcf_proto_ops cls_bpf_ops __read_mostly = { | |||
356 | .init = cls_bpf_init, | 352 | .init = cls_bpf_init, |
357 | .destroy = cls_bpf_destroy, | 353 | .destroy = cls_bpf_destroy, |
358 | .get = cls_bpf_get, | 354 | .get = cls_bpf_get, |
359 | .put = cls_bpf_put, | ||
360 | .change = cls_bpf_change, | 355 | .change = cls_bpf_change, |
361 | .delete = cls_bpf_delete, | 356 | .delete = cls_bpf_delete, |
362 | .walk = cls_bpf_walk, | 357 | .walk = cls_bpf_walk, |
diff --git a/net/sched/cls_cgroup.c b/net/sched/cls_cgroup.c index dbee65e26b3e..741bfa7debb2 100644 --- a/net/sched/cls_cgroup.c +++ b/net/sched/cls_cgroup.c | |||
@@ -67,10 +67,6 @@ static unsigned long cls_cgroup_get(struct tcf_proto *tp, u32 handle) | |||
67 | return 0UL; | 67 | return 0UL; |
68 | } | 68 | } |
69 | 69 | ||
70 | static void cls_cgroup_put(struct tcf_proto *tp, unsigned long f) | ||
71 | { | ||
72 | } | ||
73 | |||
74 | static int cls_cgroup_init(struct tcf_proto *tp) | 70 | static int cls_cgroup_init(struct tcf_proto *tp) |
75 | { | 71 | { |
76 | return 0; | 72 | return 0; |
@@ -213,7 +209,6 @@ static struct tcf_proto_ops cls_cgroup_ops __read_mostly = { | |||
213 | .classify = cls_cgroup_classify, | 209 | .classify = cls_cgroup_classify, |
214 | .destroy = cls_cgroup_destroy, | 210 | .destroy = cls_cgroup_destroy, |
215 | .get = cls_cgroup_get, | 211 | .get = cls_cgroup_get, |
216 | .put = cls_cgroup_put, | ||
217 | .delete = cls_cgroup_delete, | 212 | .delete = cls_cgroup_delete, |
218 | .walk = cls_cgroup_walk, | 213 | .walk = cls_cgroup_walk, |
219 | .dump = cls_cgroup_dump, | 214 | .dump = cls_cgroup_dump, |
diff --git a/net/sched/cls_flow.c b/net/sched/cls_flow.c index 819c23078812..8e227180cabb 100644 --- a/net/sched/cls_flow.c +++ b/net/sched/cls_flow.c | |||
@@ -581,10 +581,6 @@ static unsigned long flow_get(struct tcf_proto *tp, u32 handle) | |||
581 | return 0; | 581 | return 0; |
582 | } | 582 | } |
583 | 583 | ||
584 | static void flow_put(struct tcf_proto *tp, unsigned long f) | ||
585 | { | ||
586 | } | ||
587 | |||
588 | static int flow_dump(struct net *net, struct tcf_proto *tp, unsigned long fh, | 584 | static int flow_dump(struct net *net, struct tcf_proto *tp, unsigned long fh, |
589 | struct sk_buff *skb, struct tcmsg *t) | 585 | struct sk_buff *skb, struct tcmsg *t) |
590 | { | 586 | { |
@@ -671,7 +667,6 @@ static struct tcf_proto_ops cls_flow_ops __read_mostly = { | |||
671 | .change = flow_change, | 667 | .change = flow_change, |
672 | .delete = flow_delete, | 668 | .delete = flow_delete, |
673 | .get = flow_get, | 669 | .get = flow_get, |
674 | .put = flow_put, | ||
675 | .dump = flow_dump, | 670 | .dump = flow_dump, |
676 | .walk = flow_walk, | 671 | .walk = flow_walk, |
677 | .owner = THIS_MODULE, | 672 | .owner = THIS_MODULE, |
diff --git a/net/sched/cls_fw.c b/net/sched/cls_fw.c index dbfdfd1f1a9f..23fda2ac0d19 100644 --- a/net/sched/cls_fw.c +++ b/net/sched/cls_fw.c | |||
@@ -111,10 +111,6 @@ static unsigned long fw_get(struct tcf_proto *tp, u32 handle) | |||
111 | return 0; | 111 | return 0; |
112 | } | 112 | } |
113 | 113 | ||
114 | static void fw_put(struct tcf_proto *tp, unsigned long f) | ||
115 | { | ||
116 | } | ||
117 | |||
118 | static int fw_init(struct tcf_proto *tp) | 114 | static int fw_init(struct tcf_proto *tp) |
119 | { | 115 | { |
120 | return 0; | 116 | return 0; |
@@ -411,7 +407,6 @@ static struct tcf_proto_ops cls_fw_ops __read_mostly = { | |||
411 | .init = fw_init, | 407 | .init = fw_init, |
412 | .destroy = fw_destroy, | 408 | .destroy = fw_destroy, |
413 | .get = fw_get, | 409 | .get = fw_get, |
414 | .put = fw_put, | ||
415 | .change = fw_change, | 410 | .change = fw_change, |
416 | .delete = fw_delete, | 411 | .delete = fw_delete, |
417 | .walk = fw_walk, | 412 | .walk = fw_walk, |
diff --git a/net/sched/cls_route.c b/net/sched/cls_route.c index 109a329b7198..098a27360b91 100644 --- a/net/sched/cls_route.c +++ b/net/sched/cls_route.c | |||
@@ -256,10 +256,6 @@ static unsigned long route4_get(struct tcf_proto *tp, u32 handle) | |||
256 | return 0; | 256 | return 0; |
257 | } | 257 | } |
258 | 258 | ||
259 | static void route4_put(struct tcf_proto *tp, unsigned long f) | ||
260 | { | ||
261 | } | ||
262 | |||
263 | static int route4_init(struct tcf_proto *tp) | 259 | static int route4_init(struct tcf_proto *tp) |
264 | { | 260 | { |
265 | return 0; | 261 | return 0; |
@@ -649,7 +645,6 @@ static struct tcf_proto_ops cls_route4_ops __read_mostly = { | |||
649 | .init = route4_init, | 645 | .init = route4_init, |
650 | .destroy = route4_destroy, | 646 | .destroy = route4_destroy, |
651 | .get = route4_get, | 647 | .get = route4_get, |
652 | .put = route4_put, | ||
653 | .change = route4_change, | 648 | .change = route4_change, |
654 | .delete = route4_delete, | 649 | .delete = route4_delete, |
655 | .walk = route4_walk, | 650 | .walk = route4_walk, |
diff --git a/net/sched/cls_rsvp.h b/net/sched/cls_rsvp.h index 6bb55f277a5a..b7af3623a26a 100644 --- a/net/sched/cls_rsvp.h +++ b/net/sched/cls_rsvp.h | |||
@@ -271,10 +271,6 @@ static unsigned long rsvp_get(struct tcf_proto *tp, u32 handle) | |||
271 | return 0; | 271 | return 0; |
272 | } | 272 | } |
273 | 273 | ||
274 | static void rsvp_put(struct tcf_proto *tp, unsigned long f) | ||
275 | { | ||
276 | } | ||
277 | |||
278 | static int rsvp_init(struct tcf_proto *tp) | 274 | static int rsvp_init(struct tcf_proto *tp) |
279 | { | 275 | { |
280 | struct rsvp_head *data; | 276 | struct rsvp_head *data; |
@@ -708,7 +704,6 @@ static struct tcf_proto_ops RSVP_OPS __read_mostly = { | |||
708 | .init = rsvp_init, | 704 | .init = rsvp_init, |
709 | .destroy = rsvp_destroy, | 705 | .destroy = rsvp_destroy, |
710 | .get = rsvp_get, | 706 | .get = rsvp_get, |
711 | .put = rsvp_put, | ||
712 | .change = rsvp_change, | 707 | .change = rsvp_change, |
713 | .delete = rsvp_delete, | 708 | .delete = rsvp_delete, |
714 | .walk = rsvp_walk, | 709 | .walk = rsvp_walk, |
diff --git a/net/sched/cls_tcindex.c b/net/sched/cls_tcindex.c index 30f10fb07f4a..0d9d8911a621 100644 --- a/net/sched/cls_tcindex.c +++ b/net/sched/cls_tcindex.c | |||
@@ -116,13 +116,6 @@ static unsigned long tcindex_get(struct tcf_proto *tp, u32 handle) | |||
116 | return r && tcindex_filter_is_set(r) ? (unsigned long) r : 0UL; | 116 | return r && tcindex_filter_is_set(r) ? (unsigned long) r : 0UL; |
117 | } | 117 | } |
118 | 118 | ||
119 | |||
120 | static void tcindex_put(struct tcf_proto *tp, unsigned long f) | ||
121 | { | ||
122 | pr_debug("tcindex_put(tp %p,f 0x%lx)\n", tp, f); | ||
123 | } | ||
124 | |||
125 | |||
126 | static int tcindex_init(struct tcf_proto *tp) | 119 | static int tcindex_init(struct tcf_proto *tp) |
127 | { | 120 | { |
128 | struct tcindex_data *p; | 121 | struct tcindex_data *p; |
@@ -560,7 +553,6 @@ static struct tcf_proto_ops cls_tcindex_ops __read_mostly = { | |||
560 | .init = tcindex_init, | 553 | .init = tcindex_init, |
561 | .destroy = tcindex_destroy, | 554 | .destroy = tcindex_destroy, |
562 | .get = tcindex_get, | 555 | .get = tcindex_get, |
563 | .put = tcindex_put, | ||
564 | .change = tcindex_change, | 556 | .change = tcindex_change, |
565 | .delete = tcindex_delete, | 557 | .delete = tcindex_delete, |
566 | .walk = tcindex_walk, | 558 | .walk = tcindex_walk, |
diff --git a/net/sched/cls_u32.c b/net/sched/cls_u32.c index 0472909bb014..09487afbfd51 100644 --- a/net/sched/cls_u32.c +++ b/net/sched/cls_u32.c | |||
@@ -299,10 +299,6 @@ static unsigned long u32_get(struct tcf_proto *tp, u32 handle) | |||
299 | return (unsigned long)u32_lookup_key(ht, handle); | 299 | return (unsigned long)u32_lookup_key(ht, handle); |
300 | } | 300 | } |
301 | 301 | ||
302 | static void u32_put(struct tcf_proto *tp, unsigned long f) | ||
303 | { | ||
304 | } | ||
305 | |||
306 | static u32 gen_new_htid(struct tc_u_common *tp_c) | 302 | static u32 gen_new_htid(struct tc_u_common *tp_c) |
307 | { | 303 | { |
308 | int i = 0x800; | 304 | int i = 0x800; |
@@ -1021,7 +1017,6 @@ static struct tcf_proto_ops cls_u32_ops __read_mostly = { | |||
1021 | .init = u32_init, | 1017 | .init = u32_init, |
1022 | .destroy = u32_destroy, | 1018 | .destroy = u32_destroy, |
1023 | .get = u32_get, | 1019 | .get = u32_get, |
1024 | .put = u32_put, | ||
1025 | .change = u32_change, | 1020 | .change = u32_change, |
1026 | .delete = u32_delete, | 1021 | .delete = u32_delete, |
1027 | .walk = u32_walk, | 1022 | .walk = u32_walk, |