diff options
Diffstat (limited to 'net/sched/cls_bpf.c')
-rw-r--r-- | net/sched/cls_bpf.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/net/sched/cls_bpf.c b/net/sched/cls_bpf.c index 13f64df2c710..0e30d58149da 100644 --- a/net/sched/cls_bpf.c +++ b/net/sched/cls_bpf.c | |||
@@ -30,7 +30,7 @@ struct cls_bpf_head { | |||
30 | }; | 30 | }; |
31 | 31 | ||
32 | struct cls_bpf_prog { | 32 | struct cls_bpf_prog { |
33 | struct sk_filter *filter; | 33 | struct bpf_prog *filter; |
34 | struct sock_filter *bpf_ops; | 34 | struct sock_filter *bpf_ops; |
35 | struct tcf_exts exts; | 35 | struct tcf_exts exts; |
36 | struct tcf_result res; | 36 | struct tcf_result res; |
@@ -54,7 +54,7 @@ static int cls_bpf_classify(struct sk_buff *skb, const struct tcf_proto *tp, | |||
54 | int ret; | 54 | int ret; |
55 | 55 | ||
56 | list_for_each_entry(prog, &head->plist, link) { | 56 | list_for_each_entry(prog, &head->plist, link) { |
57 | int filter_res = SK_RUN_FILTER(prog->filter, skb); | 57 | int filter_res = BPF_PROG_RUN(prog->filter, skb); |
58 | 58 | ||
59 | if (filter_res == 0) | 59 | if (filter_res == 0) |
60 | continue; | 60 | continue; |
@@ -92,7 +92,7 @@ static void cls_bpf_delete_prog(struct tcf_proto *tp, struct cls_bpf_prog *prog) | |||
92 | tcf_unbind_filter(tp, &prog->res); | 92 | tcf_unbind_filter(tp, &prog->res); |
93 | tcf_exts_destroy(tp, &prog->exts); | 93 | tcf_exts_destroy(tp, &prog->exts); |
94 | 94 | ||
95 | sk_unattached_filter_destroy(prog->filter); | 95 | bpf_prog_destroy(prog->filter); |
96 | 96 | ||
97 | kfree(prog->bpf_ops); | 97 | kfree(prog->bpf_ops); |
98 | kfree(prog); | 98 | kfree(prog); |
@@ -161,7 +161,7 @@ static int cls_bpf_modify_existing(struct net *net, struct tcf_proto *tp, | |||
161 | struct sock_filter *bpf_ops, *bpf_old; | 161 | struct sock_filter *bpf_ops, *bpf_old; |
162 | struct tcf_exts exts; | 162 | struct tcf_exts exts; |
163 | struct sock_fprog_kern tmp; | 163 | struct sock_fprog_kern tmp; |
164 | struct sk_filter *fp, *fp_old; | 164 | struct bpf_prog *fp, *fp_old; |
165 | u16 bpf_size, bpf_len; | 165 | u16 bpf_size, bpf_len; |
166 | u32 classid; | 166 | u32 classid; |
167 | int ret; | 167 | int ret; |
@@ -193,7 +193,7 @@ static int cls_bpf_modify_existing(struct net *net, struct tcf_proto *tp, | |||
193 | tmp.len = bpf_len; | 193 | tmp.len = bpf_len; |
194 | tmp.filter = bpf_ops; | 194 | tmp.filter = bpf_ops; |
195 | 195 | ||
196 | ret = sk_unattached_filter_create(&fp, &tmp); | 196 | ret = bpf_prog_create(&fp, &tmp); |
197 | if (ret) | 197 | if (ret) |
198 | goto errout_free; | 198 | goto errout_free; |
199 | 199 | ||
@@ -211,7 +211,7 @@ static int cls_bpf_modify_existing(struct net *net, struct tcf_proto *tp, | |||
211 | tcf_exts_change(tp, &prog->exts, &exts); | 211 | tcf_exts_change(tp, &prog->exts, &exts); |
212 | 212 | ||
213 | if (fp_old) | 213 | if (fp_old) |
214 | sk_unattached_filter_destroy(fp_old); | 214 | bpf_prog_destroy(fp_old); |
215 | if (bpf_old) | 215 | if (bpf_old) |
216 | kfree(bpf_old); | 216 | kfree(bpf_old); |
217 | 217 | ||