All instances handle compat sockopts via in_compat_syscall() now, so remove the compat_{get,set} methods as well as the compat_nf_{get,set}sockopt wrappers.
Showing the changes to include/linux (1 of 4 files). Show all
Unified · Split
| @@ -164,17 +164,9 @@ struct nf_sockopt_ops { · 163 unmodified lines | ||
| 164 | 164 | int set_optmin; |
| 165 | 165 | int set_optmax; |
| 166 | 166 | int (*set)(struct sock *sk, int optval, void __user *user, unsigned int len); |
| 167 | −#ifdef CONFIG_COMPAT | |
| 168 | − int (*compat_set)(struct sock *sk, int optval, | |
| 169 | − void __user *user, unsigned int len); | |
| 170 | −#endif | |
| 171 | 167 | int get_optmin; |
| 172 | 168 | int get_optmax; |
| 173 | 169 | int (*get)(struct sock *sk, int optval, void __user *user, int *len); |
| 174 | −#ifdef CONFIG_COMPAT | |
| 175 | − int (*compat_get)(struct sock *sk, int optval, | |
| 176 | − void __user *user, int *len); | |
| 177 | −#endif | |
| 178 | 170 | /* Use the module struct to lock set/get code in place */ |
| 179 | 171 | struct module *owner; |
| 180 | 172 | }; |
| @@ -350,12 +342,6 @@ int nf_setsockopt(struct sock *sk, u_int8_t pf, int optval, char __user *opt, · 169 unmodified lines | ||
| 350 | 342 | unsigned int len); |
| 351 | 343 | int nf_getsockopt(struct sock *sk, u_int8_t pf, int optval, char __user *opt, |
| 352 | 344 | int *len); |
| 353 | −#ifdef CONFIG_COMPAT | |
| 354 | −int compat_nf_setsockopt(struct sock *sk, u_int8_t pf, int optval, | |
| 355 | − char __user *opt, unsigned int len); | |
| 356 | −int compat_nf_getsockopt(struct sock *sk, u_int8_t pf, int optval, | |
| 357 | − char __user *opt, int *len); | |
| 358 | −#endif | |
| 359 | 345 | |
| 360 | 346 | struct flowi; |
| 361 | 347 | struct nf_queue_entry; |