| Message ID | 20230317155539.2552954-5-edumazet@google.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 47fcae28b9ec409423ba7f67f93e8345acce8a36 |
| Delegated to: | Netdev Maintainers |
| Headers | show |
| Series | net: better const qualifier awareness | expand |
On Fri, Mar 17, 2023 at 03:55:33PM +0000, Eric Dumazet wrote: > We can change raw6_sk() to propagate its argument const qualifier, > thanks to container_of_const(). > > Signed-off-by: Eric Dumazet <edumazet@google.com> Reviewed-by: Simon Horman <simon.horman@corigine.com>
diff --git a/include/linux/ipv6.h b/include/linux/ipv6.h index 37dfdcfcdd542fe0efc9a1df967be3da931635d4..839247a4f48ea76b5d6daa9a54a7b87627635066 100644 --- a/include/linux/ipv6.h +++ b/include/linux/ipv6.h @@ -336,10 +336,7 @@ static inline struct ipv6_pinfo *inet6_sk(const struct sock *__sk) return sk_fullsock(__sk) ? inet_sk(__sk)->pinet6 : NULL; } -static inline struct raw6_sock *raw6_sk(const struct sock *sk) -{ - return (struct raw6_sock *)sk; -} +#define raw6_sk(ptr) container_of_const(ptr, struct raw6_sock, inet.sk) #define ipv6_only_sock(sk) (sk->sk_ipv6only) #define ipv6_sk_rxinfo(sk) ((sk)->sk_family == PF_INET6 && \
We can change raw6_sk() to propagate its argument const qualifier, thanks to container_of_const(). Signed-off-by: Eric Dumazet <edumazet@google.com> --- include/linux/ipv6.h | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-)