diff options
| author | David S. Miller <davem@davemloft.net> | 2022-04-22 14:47:51 +0300 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2022-04-22 14:47:51 +0300 |
| commit | 42d594357e01e360b78e13659c42de1598698fd2 (patch) | |
| tree | ecd21aa4fc72c17f4fbf6074a2f6f036b66018c2 /include/linux | |
| parent | 0844d36f771d3fe3c418df7569396a9a58feab85 (diff) | |
| parent | 81ee0eb6c0fe34490ed92667538197d9295e899e (diff) | |
| download | linux-42d594357e01e360b78e13659c42de1598698fd2.tar.xz | |
Merge branch 'ipv6-only-sock'
Kuniyuki Iwashima says:
====================
ipv6: Use ipv6_only_sock helper function.
The first patch removes __ipv6_only_sock(), and the second replaces
ipv6only tests with ipv6_only_sock().
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/ipv6.h | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/include/linux/ipv6.h b/include/linux/ipv6.h index 918bfea4ef5f..ec5ca392eaa3 100644 --- a/include/linux/ipv6.h +++ b/include/linux/ipv6.h @@ -340,8 +340,7 @@ static inline struct raw6_sock *raw6_sk(const struct sock *sk) return (struct raw6_sock *)sk; } -#define __ipv6_only_sock(sk) (sk->sk_ipv6only) -#define ipv6_only_sock(sk) (__ipv6_only_sock(sk)) +#define ipv6_only_sock(sk) (sk->sk_ipv6only) #define ipv6_sk_rxinfo(sk) ((sk)->sk_family == PF_INET6 && \ inet6_sk(sk)->rxopt.bits.rxinfo) @@ -358,7 +357,6 @@ static inline int inet_v6_ipv6only(const struct sock *sk) return ipv6_only_sock(sk); } #else -#define __ipv6_only_sock(sk) 0 #define ipv6_only_sock(sk) 0 #define ipv6_sk_rxinfo(sk) 0 |