diff options
author | YOSHIFUJI Hideaki/吉藤英明 <hideaki.yoshifuji@miraclelinux.com> | 2015-03-23 05:04:13 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2015-03-23 16:54:34 -0400 |
commit | 443b5991a748c844610cb27f19473b56d5fc4dd1 (patch) | |
tree | 92ea6769582732de44062300a8691b0b1a5ba1c5 /net/core | |
parent | 86c1aee1178c8e57dae10a9e73c51069098e4b5b (diff) |
net: Move the comment about unsettable socket-level options to default clause and update its reference.
We implement the SO_SNDLOWAT etc not to be settable and return
ENOPROTOOPT per 1003.1g 7. Move the comment to appropriate
position and update the reference.
Signed-off-by: YOSHIFUJI Hideaki <hideaki.yoshifuji@miraclelinux.com>
Signed-off-by: YOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/core')
-rw-r--r-- | net/core/sock.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/net/core/sock.c b/net/core/sock.c index 841108b5649f..119ae464b44a 100644 --- a/net/core/sock.c +++ b/net/core/sock.c | |||
@@ -928,8 +928,6 @@ set_rcvbuf: | |||
928 | sk->sk_mark = val; | 928 | sk->sk_mark = val; |
929 | break; | 929 | break; |
930 | 930 | ||
931 | /* We implement the SO_SNDLOWAT etc to | ||
932 | not be settable (1003.1g 5.3) */ | ||
933 | case SO_RXQ_OVFL: | 931 | case SO_RXQ_OVFL: |
934 | sock_valbool_flag(sk, SOCK_RXQ_OVFL, valbool); | 932 | sock_valbool_flag(sk, SOCK_RXQ_OVFL, valbool); |
935 | break; | 933 | break; |
@@ -1234,6 +1232,9 @@ int sock_getsockopt(struct socket *sock, int level, int optname, | |||
1234 | break; | 1232 | break; |
1235 | 1233 | ||
1236 | default: | 1234 | default: |
1235 | /* We implement the SO_SNDLOWAT etc to not be settable | ||
1236 | * (1003.1g 7). | ||
1237 | */ | ||
1237 | return -ENOPROTOOPT; | 1238 | return -ENOPROTOOPT; |
1238 | } | 1239 | } |
1239 | 1240 | ||