net: sock_flag() cleanup

- sock_flag() accepts a const pointer

- sock_flag() returns a boolean

Signed-off-by: Eric Dumazet <edumazet@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/include/net/sock.h b/include/net/sock.h
index e613704e9d1c1280cb332dc9d6f76a73f9799289..036f5069b6e088809b8eebb6384636c1d8096c8f 100644 (file)
--- a/include/net/sock.h
+++ b/include/net/sock.h
@@ -650,7 +650,7 @@ static inline void sock_reset_flag(struct sock *sk, enum sock_flags flag)
        __clear_bit(flag, &sk->sk_flags);
 }
 
-static inline int sock_flag(struct sock *sk, enum sock_flags flag)
+static inline bool sock_flag(const struct sock *sk, enum sock_flags flag)
 {
        return test_bit(flag, &sk->sk_flags);
 }

diff --git a/net/core/sock.c b/net/core/sock.c
index 26ed27fb2bfb87f55300c220599c03ddf754d8bf..9d144ee7e3798976ab16831491d73d63a05290f7 100644 (file)
--- a/net/core/sock.c
+++ b/net/core/sock.c
@@ -849,7 +849,7 @@ int sock_getsockopt(struct socket *sock, int level, int optname,
                break;
 
        case SO_BROADCAST:
-               v.val = !!sock_flag(sk, SOCK_BROADCAST);
+               v.val = sock_flag(sk, SOCK_BROADCAST);
                break;
 
        case SO_SNDBUF:
@@ -865,7 +865,7 @@ int sock_getsockopt(struct socket *sock, int level, int optname,
                break;
 
        case SO_KEEPALIVE:
-               v.val = !!sock_flag(sk, SOCK_KEEPOPEN);
+               v.val = sock_flag(sk, SOCK_KEEPOPEN);
                break;
 
        case SO_TYPE:
@@ -887,7 +887,7 @@ int sock_getsockopt(struct socket *sock, int level, int optname,
                break;
 
        case SO_OOBINLINE:
-               v.val = !!sock_flag(sk, SOCK_URGINLINE);
+               v.val = sock_flag(sk, SOCK_URGINLINE);
                break;
 
        case SO_NO_CHECK:
@@ -900,7 +900,7 @@ int sock_getsockopt(struct socket *sock, int level, int optname,
 
        case SO_LINGER:
                lv              = sizeof(v.ling);
-               v.ling.l_onoff  = !!sock_flag(sk, SOCK_LINGER);
+               v.ling.l_onoff  = sock_flag(sk, SOCK_LINGER);
                v.ling.l_linger = sk->sk_lingertime / HZ;
                break;
 
@@ -1012,11 +1012,11 @@ int sock_getsockopt(struct socket *sock, int level, int optname,
                break;
 
        case SO_RXQ_OVFL:
-               v.val = !!sock_flag(sk, SOCK_RXQ_OVFL);
+               v.val = sock_flag(sk, SOCK_RXQ_OVFL);
                break;
 
        case SO_WIFI_STATUS:
-               v.val = !!sock_flag(sk, SOCK_WIFI_STATUS);
+               v.val = sock_flag(sk, SOCK_WIFI_STATUS);
                break;
 
        case SO_PEEK_OFF:
@@ -1026,7 +1026,7 @@ int sock_getsockopt(struct socket *sock, int level, int optname,
                v.val = sk->sk_peek_off;
                break;
        case SO_NOFCS:
-               v.val = !!sock_flag(sk, SOCK_NOFCS);
+               v.val = sock_flag(sk, SOCK_NOFCS);
                break;
        default:
                return -ENOPROTOOPT;