2022-07-26 06:17:02

by Leonard Crestez

Subject: [PATCH v6 02/26] tcp: authopt: Remove more unused noops

Signed-off-by: Leonard Crestez <[email protected]>
---
include/net/tcp_authopt.h | 4 ----
1 file changed, 4 deletions(-)

diff --git a/include/net/tcp_authopt.h b/include/net/tcp_authopt.h
index adf325c260d5..bc2cff82830d 100644
--- a/include/net/tcp_authopt.h
+++ b/include/net/tcp_authopt.h
@@ -60,14 +60,10 @@ DECLARE_STATIC_KEY_FALSE(tcp_authopt_needed_key);
void tcp_authopt_clear(struct sock *sk);
int tcp_set_authopt(struct sock *sk, sockptr_t optval, unsigned int optlen);
int tcp_get_authopt_val(struct sock *sk, struct tcp_authopt *key);
int tcp_set_authopt_key(struct sock *sk, sockptr_t optval, unsigned int optlen);
#else
-static inline int tcp_get_authopt_val(struct sock *sk, struct tcp_authopt *key)
-{
- return -ENOPROTOOPT;
-}
static inline void tcp_authopt_clear(struct sock *sk)
{
}
#endif

--
2.25.1

2022-07-27 01:20:00

by David Ahern

Subject: Re: [PATCH v6 02/26] tcp: authopt: Remove more unused noops

On 7/26/22 12:15 AM, Leonard Crestez wrote:
> Signed-off-by: Leonard Crestez <[email protected]>
> ---
> include/net/tcp_authopt.h | 4 ----
> 1 file changed, 4 deletions(-)
>
> diff --git a/include/net/tcp_authopt.h b/include/net/tcp_authopt.h
> index adf325c260d5..bc2cff82830d 100644
> --- a/include/net/tcp_authopt.h
> +++ b/include/net/tcp_authopt.h
> @@ -60,14 +60,10 @@ DECLARE_STATIC_KEY_FALSE(tcp_authopt_needed_key);
> void tcp_authopt_clear(struct sock *sk);
> int tcp_set_authopt(struct sock *sk, sockptr_t optval, unsigned int optlen);
> int tcp_get_authopt_val(struct sock *sk, struct tcp_authopt *key);
> int tcp_set_authopt_key(struct sock *sk, sockptr_t optval, unsigned int optlen);
> #else
> -static inline int tcp_get_authopt_val(struct sock *sk, struct tcp_authopt *key)
> -{
> - return -ENOPROTOOPT;
> -}
> static inline void tcp_authopt_clear(struct sock *sk)
> {
> }
> #endif
>
added in the previous patch, so this one should be folded into patch 1

2022-07-27 08:52:12

by Leonard Crestez

Subject: Re: [PATCH v6 02/26] tcp: authopt: Remove more unused noops

On 7/27/22 04:17, David Ahern wrote:
> On 7/26/22 12:15 AM, Leonard Crestez wrote:
>> Signed-off-by: Leonard Crestez <[email protected]>
>> ---
>> include/net/tcp_authopt.h | 4 ----
>> 1 file changed, 4 deletions(-)
>>
>> diff --git a/include/net/tcp_authopt.h b/include/net/tcp_authopt.h
>> index adf325c260d5..bc2cff82830d 100644
>> --- a/include/net/tcp_authopt.h
>> +++ b/include/net/tcp_authopt.h
>> @@ -60,14 +60,10 @@ DECLARE_STATIC_KEY_FALSE(tcp_authopt_needed_key);
>> void tcp_authopt_clear(struct sock *sk);
>> int tcp_set_authopt(struct sock *sk, sockptr_t optval, unsigned int optlen);
>> int tcp_get_authopt_val(struct sock *sk, struct tcp_authopt *key);
>> int tcp_set_authopt_key(struct sock *sk, sockptr_t optval, unsigned int optlen);
>> #else
>> -static inline int tcp_get_authopt_val(struct sock *sk, struct tcp_authopt *key)
>> -{
>> - return -ENOPROTOOPT;
>> -}
>> static inline void tcp_authopt_clear(struct sock *sk)
>> {
>> }
>> #endif
>>
> added in the previous patch, so this one should be folded into patch 1
Yes this was intended for squashing but missed somehow; sorry!

--
Regards,
Leonard