diff options
| author |   David S. Miller <davem@davemloft.net> | 2014-05-23 16:48:50 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2014-05-23 16:48:50 -0400 |
| commit | be65de7174123e02477bd488db1a657caf0f9947 (patch) | |
| tree | ef3101980fef5d2f580026d96c78b40fe007b43b /drivers/net/ppp/ppp_generic.c | |
| parent | Merge branch 'inet_csums_part3' (diff) | |
| parent | net: filter: add test case for jump with holes and ret x variants (diff) | |
| download | linux-dev-be65de7174123e02477bd488db1a657caf0f9947.tar.xz linux-dev-be65de7174123e02477bd488db1a657caf0f9947.zip | |
Merge branch 'filter-next'
Daniel Borkmann says:
====================
BPF updates
These were still in my queue. Please see individual patches for
details.
I have rebased these on top of current net-next with Andrew's
gcc union fixup [1] applied to avoid dealing with an unnecessary
merge conflict.
[1] http://patchwork.ozlabs.org/patch/351577/
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ppp/ppp_generic.c')
| -rw-r--r-- | drivers/net/ppp/ppp_generic.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/ppp/ppp_generic.c b/drivers/net/ppp/ppp_generic.c index e3923ebb693f..91d6c1272fcf 100644 --- a/drivers/net/ppp/ppp_generic.c +++ b/drivers/net/ppp/ppp_generic.c @@ -757,7 +757,7 @@ static long ppp_ioctl(struct file *file, unsigned int cmd, unsigned long arg) err = get_filter(argp, &code); if (err >= 0) { - struct sock_fprog fprog = { + struct sock_fprog_kern fprog = { .len = err, .filter = code, }; @@ -778,7 +778,7 @@ static long ppp_ioctl(struct file *file, unsigned int cmd, unsigned long arg) err = get_filter(argp, &code); if (err >= 0) { - struct sock_fprog fprog = { + struct sock_fprog_kern fprog = { .len = err, .filter = code, }; |