Replace POSIX u_int8_t with preferred kernel type u8, update prototype and struct definition. No functional changes. Signed-off-by: Carlos Grillet --- include/linux/netfilter.h | 6 +++--- net/netfilter/nf_sockopt.c | 8 ++++---- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/include/linux/netfilter.h b/include/linux/netfilter.h index efbbfa770d66..91b68bdba3f5 100644 --- a/include/linux/netfilter.h +++ b/include/linux/netfilter.h @@ -181,7 +181,7 @@ static inline void nf_hook_state_init(struct nf_hook_state *p, struct nf_sockopt_ops { struct list_head list; - u_int8_t pf; + u8 pf; /* Non-inclusive ranges: use 0/0/NULL to never get called. */ int set_optmin; @@ -357,9 +357,9 @@ NF_HOOK_LIST(uint8_t pf, unsigned int hook, struct net *net, struct sock *sk, } /* Call setsockopt() */ -int nf_setsockopt(struct sock *sk, u_int8_t pf, int optval, sockptr_t opt, +int nf_setsockopt(struct sock *sk, u8 pf, int optval, sockptr_t opt, unsigned int len); -int nf_getsockopt(struct sock *sk, u_int8_t pf, int optval, char __user *opt, +int nf_getsockopt(struct sock *sk, u8 pf, int optval, char __user *opt, int *len); struct flowi; diff --git a/net/netfilter/nf_sockopt.c b/net/netfilter/nf_sockopt.c index 34afcd03b6f6..19a1d028158c 100644 --- a/net/netfilter/nf_sockopt.c +++ b/net/netfilter/nf_sockopt.c @@ -59,8 +59,8 @@ void nf_unregister_sockopt(struct nf_sockopt_ops *reg) } EXPORT_SYMBOL(nf_unregister_sockopt); -static struct nf_sockopt_ops *nf_sockopt_find(struct sock *sk, u_int8_t pf, - int val, int get) +static struct nf_sockopt_ops *nf_sockopt_find(struct sock *sk, u8 pf, + int val, int get) { struct nf_sockopt_ops *ops; @@ -89,7 +89,7 @@ static struct nf_sockopt_ops *nf_sockopt_find(struct sock *sk, u_int8_t pf, return ops; } -int nf_setsockopt(struct sock *sk, u_int8_t pf, int val, sockptr_t opt, +int nf_setsockopt(struct sock *sk, u8 pf, int val, sockptr_t opt, unsigned int len) { struct nf_sockopt_ops *ops; @@ -104,7 +104,7 @@ int nf_setsockopt(struct sock *sk, u_int8_t pf, int val, sockptr_t opt, } EXPORT_SYMBOL(nf_setsockopt); -int nf_getsockopt(struct sock *sk, u_int8_t pf, int val, char __user *opt, +int nf_getsockopt(struct sock *sk, u8 pf, int val, char __user *opt, int *len) { struct nf_sockopt_ops *ops; -- 2.54.0