diff options
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/isdn/i4l/isdn_ppp.c | 4 | ||||
-rw-r--r-- | drivers/net/ppp/ppp_generic.c | 4 | ||||
-rw-r--r-- | drivers/net/team/team_mode_loadbalance.c | 10 |
3 files changed, 9 insertions, 9 deletions
diff --git a/drivers/isdn/i4l/isdn_ppp.c b/drivers/isdn/i4l/isdn_ppp.c index a5da511e3c9a..61ac63237446 100644 --- a/drivers/isdn/i4l/isdn_ppp.c +++ b/drivers/isdn/i4l/isdn_ppp.c | |||
@@ -634,7 +634,7 @@ isdn_ppp_ioctl(int min, struct file *file, unsigned int cmd, unsigned long arg) | |||
634 | #ifdef CONFIG_IPPP_FILTER | 634 | #ifdef CONFIG_IPPP_FILTER |
635 | case PPPIOCSPASS: | 635 | case PPPIOCSPASS: |
636 | { | 636 | { |
637 | struct sock_fprog fprog; | 637 | struct sock_fprog_kern fprog; |
638 | struct sock_filter *code; | 638 | struct sock_filter *code; |
639 | int err, len = get_filter(argp, &code); | 639 | int err, len = get_filter(argp, &code); |
640 | 640 | ||
@@ -653,7 +653,7 @@ isdn_ppp_ioctl(int min, struct file *file, unsigned int cmd, unsigned long arg) | |||
653 | } | 653 | } |
654 | case PPPIOCSACTIVE: | 654 | case PPPIOCSACTIVE: |
655 | { | 655 | { |
656 | struct sock_fprog fprog; | 656 | struct sock_fprog_kern fprog; |
657 | struct sock_filter *code; | 657 | struct sock_filter *code; |
658 | int err, len = get_filter(argp, &code); | 658 | int err, len = get_filter(argp, &code); |
659 | 659 | ||
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) | |||
757 | 757 | ||
758 | err = get_filter(argp, &code); | 758 | err = get_filter(argp, &code); |
759 | if (err >= 0) { | 759 | if (err >= 0) { |
760 | struct sock_fprog fprog = { | 760 | struct sock_fprog_kern fprog = { |
761 | .len = err, | 761 | .len = err, |
762 | .filter = code, | 762 | .filter = code, |
763 | }; | 763 | }; |
@@ -778,7 +778,7 @@ static long ppp_ioctl(struct file *file, unsigned int cmd, unsigned long arg) | |||
778 | 778 | ||
779 | err = get_filter(argp, &code); | 779 | err = get_filter(argp, &code); |
780 | if (err >= 0) { | 780 | if (err >= 0) { |
781 | struct sock_fprog fprog = { | 781 | struct sock_fprog_kern fprog = { |
782 | .len = err, | 782 | .len = err, |
783 | .filter = code, | 783 | .filter = code, |
784 | }; | 784 | }; |
diff --git a/drivers/net/team/team_mode_loadbalance.c b/drivers/net/team/team_mode_loadbalance.c index dbde3412ee5e..0a6ee07bf0af 100644 --- a/drivers/net/team/team_mode_loadbalance.c +++ b/drivers/net/team/team_mode_loadbalance.c | |||
@@ -49,7 +49,7 @@ struct lb_port_mapping { | |||
49 | struct lb_priv_ex { | 49 | struct lb_priv_ex { |
50 | struct team *team; | 50 | struct team *team; |
51 | struct lb_port_mapping tx_hash_to_port_mapping[LB_TX_HASHTABLE_SIZE]; | 51 | struct lb_port_mapping tx_hash_to_port_mapping[LB_TX_HASHTABLE_SIZE]; |
52 | struct sock_fprog *orig_fprog; | 52 | struct sock_fprog_kern *orig_fprog; |
53 | struct { | 53 | struct { |
54 | unsigned int refresh_interval; /* in tenths of second */ | 54 | unsigned int refresh_interval; /* in tenths of second */ |
55 | struct delayed_work refresh_dw; | 55 | struct delayed_work refresh_dw; |
@@ -241,10 +241,10 @@ static int lb_bpf_func_get(struct team *team, struct team_gsetter_ctx *ctx) | |||
241 | return 0; | 241 | return 0; |
242 | } | 242 | } |
243 | 243 | ||
244 | static int __fprog_create(struct sock_fprog **pfprog, u32 data_len, | 244 | static int __fprog_create(struct sock_fprog_kern **pfprog, u32 data_len, |
245 | const void *data) | 245 | const void *data) |
246 | { | 246 | { |
247 | struct sock_fprog *fprog; | 247 | struct sock_fprog_kern *fprog; |
248 | struct sock_filter *filter = (struct sock_filter *) data; | 248 | struct sock_filter *filter = (struct sock_filter *) data; |
249 | 249 | ||
250 | if (data_len % sizeof(struct sock_filter)) | 250 | if (data_len % sizeof(struct sock_filter)) |
@@ -262,7 +262,7 @@ static int __fprog_create(struct sock_fprog **pfprog, u32 data_len, | |||
262 | return 0; | 262 | return 0; |
263 | } | 263 | } |
264 | 264 | ||
265 | static void __fprog_destroy(struct sock_fprog *fprog) | 265 | static void __fprog_destroy(struct sock_fprog_kern *fprog) |
266 | { | 266 | { |
267 | kfree(fprog->filter); | 267 | kfree(fprog->filter); |
268 | kfree(fprog); | 268 | kfree(fprog); |
@@ -273,7 +273,7 @@ static int lb_bpf_func_set(struct team *team, struct team_gsetter_ctx *ctx) | |||
273 | struct lb_priv *lb_priv = get_lb_priv(team); | 273 | struct lb_priv *lb_priv = get_lb_priv(team); |
274 | struct sk_filter *fp = NULL; | 274 | struct sk_filter *fp = NULL; |
275 | struct sk_filter *orig_fp; | 275 | struct sk_filter *orig_fp; |
276 | struct sock_fprog *fprog = NULL; | 276 | struct sock_fprog_kern *fprog = NULL; |
277 | int err; | 277 | int err; |
278 | 278 | ||
279 | if (ctx->data.bin_val.len) { | 279 | if (ctx->data.bin_val.len) { |