diff options
| author | KalimochoAz <calimochoazucarado@gmail.com> | 2012-10-14 11:03:07 +0200 |
|---|---|---|
| committer | KalimochoAz <calimochoazucarado@gmail.com> | 2012-10-14 11:03:07 +0200 |
| commit | 8a229ae2d652b42437863787cfc28f7f8a78a35d (patch) | |
| tree | 9b3b8f31202f5ec2e3963e48d2cf7afd7a719ac8 /net/core/sock.c | |
| parent | ac5ad2a19b7c3ffa766309c5ef3de0c79fa076c4 (diff) | |
| parent | 2e54c4fb47ffcc687457f9bcd9bba895f2a84963 (diff) | |
| download | kernel_samsung_crespo-8a229ae2d652b42437863787cfc28f7f8a78a35d.zip kernel_samsung_crespo-8a229ae2d652b42437863787cfc28f7f8a78a35d.tar.gz kernel_samsung_crespo-8a229ae2d652b42437863787cfc28f7f8a78a35d.tar.bz2 | |
Merge commit '2e54c4f' into HEAD
Diffstat (limited to 'net/core/sock.c')
| -rw-r--r-- | net/core/sock.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/net/core/sock.c b/net/core/sock.c index 56623ad..3da11ba 100644 --- a/net/core/sock.c +++ b/net/core/sock.c @@ -594,7 +594,8 @@ set_rcvbuf: case SO_KEEPALIVE: #ifdef CONFIG_INET - if (sk->sk_protocol == IPPROTO_TCP) + if (sk->sk_protocol == IPPROTO_TCP && + sk->sk_type == SOCK_STREAM) tcp_set_keepalive(sk, valbool); #endif sock_valbool_flag(sk, SOCK_KEEPOPEN, valbool); |