Commit 009937e7 authored by Alexei Starovoitov's avatar Alexei Starovoitov Committed by David S. Miller

net: filter: rename sk_filter_proglen -> bpf_classic_proglen

trivial rename to better match semantics of macro
Signed-off-by: default avatarAlexei Starovoitov <ast@plumgrid.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 278571ba
...@@ -344,8 +344,7 @@ static inline unsigned int sk_filter_size(unsigned int proglen) ...@@ -344,8 +344,7 @@ static inline unsigned int sk_filter_size(unsigned int proglen)
offsetof(struct sk_filter, insns[proglen])); offsetof(struct sk_filter, insns[proglen]));
} }
#define sk_filter_proglen(fprog) \ #define bpf_classic_proglen(fprog) (fprog->len * sizeof(fprog->filter[0]))
(fprog->len * sizeof(fprog->filter[0]))
int sk_filter(struct sock *sk, struct sk_buff *skb); int sk_filter(struct sock *sk, struct sk_buff *skb);
......
...@@ -813,7 +813,7 @@ EXPORT_SYMBOL(sk_chk_filter); ...@@ -813,7 +813,7 @@ EXPORT_SYMBOL(sk_chk_filter);
static int sk_store_orig_filter(struct sk_filter *fp, static int sk_store_orig_filter(struct sk_filter *fp,
const struct sock_fprog *fprog) const struct sock_fprog *fprog)
{ {
unsigned int fsize = sk_filter_proglen(fprog); unsigned int fsize = bpf_classic_proglen(fprog);
struct sock_fprog_kern *fkprog; struct sock_fprog_kern *fkprog;
fp->orig_prog = kmalloc(sizeof(*fkprog), GFP_KERNEL); fp->orig_prog = kmalloc(sizeof(*fkprog), GFP_KERNEL);
...@@ -1001,7 +1001,7 @@ static struct sk_filter *__sk_prepare_filter(struct sk_filter *fp) ...@@ -1001,7 +1001,7 @@ static struct sk_filter *__sk_prepare_filter(struct sk_filter *fp)
int sk_unattached_filter_create(struct sk_filter **pfp, int sk_unattached_filter_create(struct sk_filter **pfp,
struct sock_fprog_kern *fprog) struct sock_fprog_kern *fprog)
{ {
unsigned int fsize = sk_filter_proglen(fprog); unsigned int fsize = bpf_classic_proglen(fprog);
struct sk_filter *fp; struct sk_filter *fp;
/* Make sure new filter is there and in the right amounts. */ /* Make sure new filter is there and in the right amounts. */
...@@ -1053,7 +1053,7 @@ EXPORT_SYMBOL_GPL(sk_unattached_filter_destroy); ...@@ -1053,7 +1053,7 @@ EXPORT_SYMBOL_GPL(sk_unattached_filter_destroy);
int sk_attach_filter(struct sock_fprog *fprog, struct sock *sk) int sk_attach_filter(struct sock_fprog *fprog, struct sock *sk)
{ {
struct sk_filter *fp, *old_fp; struct sk_filter *fp, *old_fp;
unsigned int fsize = sk_filter_proglen(fprog); unsigned int fsize = bpf_classic_proglen(fprog);
unsigned int sk_fsize = sk_filter_size(fprog->len); unsigned int sk_fsize = sk_filter_size(fprog->len);
int err; int err;
...@@ -1154,7 +1154,7 @@ int sk_get_filter(struct sock *sk, struct sock_filter __user *ubuf, ...@@ -1154,7 +1154,7 @@ int sk_get_filter(struct sock *sk, struct sock_filter __user *ubuf,
goto out; goto out;
ret = -EFAULT; ret = -EFAULT;
if (copy_to_user(ubuf, fprog->filter, sk_filter_proglen(fprog))) if (copy_to_user(ubuf, fprog->filter, bpf_classic_proglen(fprog)))
goto out; goto out;
/* Instead of bytes, the API requests to return the number /* Instead of bytes, the API requests to return the number
......
...@@ -69,7 +69,7 @@ int sock_diag_put_filterinfo(bool may_report_filterinfo, struct sock *sk, ...@@ -69,7 +69,7 @@ int sock_diag_put_filterinfo(bool may_report_filterinfo, struct sock *sk,
goto out; goto out;
fprog = filter->orig_prog; fprog = filter->orig_prog;
flen = sk_filter_proglen(fprog); flen = bpf_classic_proglen(fprog);
attr = nla_reserve(skb, attrtype, flen); attr = nla_reserve(skb, attrtype, flen);
if (attr == NULL) { if (attr == NULL) {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment