Commit 1b23a5df authored by Eric Dumazet's avatar Eric Dumazet Committed by David S. Miller
Browse files

net: sock_flag() cleanup 



- sock_flag() accepts a const pointer

- sock_flag() returns a boolean

Signed-off-by: default avatarEric Dumazet <edumazet@google.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 865ec552

include/net/sock.h

+1 −1
Original line number Diff line number Diff line
@@ -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);

}

net/core/sock.c

+7 −7
Original line number Diff line number Diff line
@@ -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;