mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
synced 2025-01-26 02:25:00 -05:00
net: cleanups in sock_setsockopt()
Use min_t()/max_t() macros, reformat two comments, use !!test_bit() to match !!sock_flag() Signed-off-by: Eric Dumazet <edumazet@google.com> Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
parent
c60f6aa8ac
commit
8298193012
1 changed files with 15 additions and 27 deletions
|
@ -577,23 +577,15 @@ int sock_setsockopt(struct socket *sock, int level, int optname,
|
||||||
break;
|
break;
|
||||||
case SO_SNDBUF:
|
case SO_SNDBUF:
|
||||||
/* Don't error on this BSD doesn't and if you think
|
/* Don't error on this BSD doesn't and if you think
|
||||||
about it this is right. Otherwise apps have to
|
* about it this is right. Otherwise apps have to
|
||||||
play 'guess the biggest size' games. RCVBUF/SNDBUF
|
* play 'guess the biggest size' games. RCVBUF/SNDBUF
|
||||||
are treated in BSD as hints */
|
* are treated in BSD as hints
|
||||||
|
*/
|
||||||
if (val > sysctl_wmem_max)
|
val = min_t(u32, val, sysctl_wmem_max);
|
||||||
val = sysctl_wmem_max;
|
|
||||||
set_sndbuf:
|
set_sndbuf:
|
||||||
sk->sk_userlocks |= SOCK_SNDBUF_LOCK;
|
sk->sk_userlocks |= SOCK_SNDBUF_LOCK;
|
||||||
if ((val * 2) < SOCK_MIN_SNDBUF)
|
sk->sk_sndbuf = max_t(u32, val * 2, SOCK_MIN_SNDBUF);
|
||||||
sk->sk_sndbuf = SOCK_MIN_SNDBUF;
|
/* Wake up sending tasks if we upped the value. */
|
||||||
else
|
|
||||||
sk->sk_sndbuf = val * 2;
|
|
||||||
|
|
||||||
/*
|
|
||||||
* Wake up sending tasks if we
|
|
||||||
* upped the value.
|
|
||||||
*/
|
|
||||||
sk->sk_write_space(sk);
|
sk->sk_write_space(sk);
|
||||||
break;
|
break;
|
||||||
|
|
||||||
|
@ -606,12 +598,11 @@ set_sndbuf:
|
||||||
|
|
||||||
case SO_RCVBUF:
|
case SO_RCVBUF:
|
||||||
/* Don't error on this BSD doesn't and if you think
|
/* Don't error on this BSD doesn't and if you think
|
||||||
about it this is right. Otherwise apps have to
|
* about it this is right. Otherwise apps have to
|
||||||
play 'guess the biggest size' games. RCVBUF/SNDBUF
|
* play 'guess the biggest size' games. RCVBUF/SNDBUF
|
||||||
are treated in BSD as hints */
|
* are treated in BSD as hints
|
||||||
|
*/
|
||||||
if (val > sysctl_rmem_max)
|
val = min_t(u32, val, sysctl_rmem_max);
|
||||||
val = sysctl_rmem_max;
|
|
||||||
set_rcvbuf:
|
set_rcvbuf:
|
||||||
sk->sk_userlocks |= SOCK_RCVBUF_LOCK;
|
sk->sk_userlocks |= SOCK_RCVBUF_LOCK;
|
||||||
/*
|
/*
|
||||||
|
@ -629,10 +620,7 @@ set_rcvbuf:
|
||||||
* returning the value we actually used in getsockopt
|
* returning the value we actually used in getsockopt
|
||||||
* is the most desirable behavior.
|
* is the most desirable behavior.
|
||||||
*/
|
*/
|
||||||
if ((val * 2) < SOCK_MIN_RCVBUF)
|
sk->sk_rcvbuf = max_t(u32, val * 2, SOCK_MIN_RCVBUF);
|
||||||
sk->sk_rcvbuf = SOCK_MIN_RCVBUF;
|
|
||||||
else
|
|
||||||
sk->sk_rcvbuf = val * 2;
|
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case SO_RCVBUFFORCE:
|
case SO_RCVBUFFORCE:
|
||||||
|
@ -975,7 +963,7 @@ int sock_getsockopt(struct socket *sock, int level, int optname,
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case SO_PASSCRED:
|
case SO_PASSCRED:
|
||||||
v.val = test_bit(SOCK_PASSCRED, &sock->flags) ? 1 : 0;
|
v.val = !!test_bit(SOCK_PASSCRED, &sock->flags);
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case SO_PEERCRED:
|
case SO_PEERCRED:
|
||||||
|
@ -1010,7 +998,7 @@ int sock_getsockopt(struct socket *sock, int level, int optname,
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case SO_PASSSEC:
|
case SO_PASSSEC:
|
||||||
v.val = test_bit(SOCK_PASSSEC, &sock->flags) ? 1 : 0;
|
v.val = !!test_bit(SOCK_PASSSEC, &sock->flags);
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case SO_PEERSEC:
|
case SO_PEERSEC:
|
||||||
|
|
Loading…
Add table
Reference in a new issue