diff mbox series

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

Message ID 2e9007e2f536ef2b8e3dfdaa1dd44dcc6bfc125f.1658815925.git.cdleonard@gmail.com (mailing list archive)
State Not Applicable
Delegated to: Herbert Xu
Headers show
Series tcp: Initial support for RFC5925 auth option | expand

Commit Message

Leonard Crestez July 26, 2022, 6:15 a.m. UTC 
Signed-off-by: Leonard Crestez <cdleonard@gmail.com>
---
 include/net/tcp_authopt.h | 4 ----
 1 file changed, 4 deletions(-)

Comments

David Ahern July 27, 2022, 1:17 a.m. UTC | #1 
On 7/26/22 12:15 AM, Leonard Crestez wrote:
> Signed-off-by: Leonard Crestez <cdleonard@gmail.com>
> ---
>  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
Leonard Crestez July 27, 2022, 8:49 a.m. UTC | #2 
On 7/27/22 04:17, David Ahern wrote:
> On 7/26/22 12:15 AM, Leonard Crestez wrote:
>> Signed-off-by: Leonard Crestez <cdleonard@gmail.com>
>> ---
>>   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
diff mbox series

Patch

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