diff --git a/[refs] b/[refs]
index 4a3ba3764f33..985eb4bb02b4 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 69190e67d4fac49e2f6ea22f46780d0c712214b8
+refs/heads/master: 3e10986d1d698140747fcfc2761ec9cb64c1d582
diff --git a/trunk/net/core/sock.c b/trunk/net/core/sock.c
index 305792076121..a6000fbad294 100644
--- a/trunk/net/core/sock.c
+++ b/trunk/net/core/sock.c
@@ -691,7 +691,8 @@ int sock_setsockopt(struct socket *sock, int level, int optname,
 
 	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);