X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=net%2Fcore%2Fsock.c;h=5dbb81bc96733d260e97c9c573acde9260b58174;hb=9d87dd97ffcd3b5eb2bbaf0d5d93f4bfcaed3f04;hp=5ac05269355474dafda721357934be004a52ac3d;hpb=5309fbcc475084e6c1566084f770cef927937b7b;p=linux-2.6

diff --git a/net/core/sock.c b/net/core/sock.c
index 5ac0526935..5dbb81bc96 100644
--- a/net/core/sock.c
+++ b/net/core/sock.c
@@ -450,15 +450,6 @@ int sock_setsockopt(struct socket *sock, int level, int optname,
 	 *	Options without arguments
 	 */
 
-#ifdef SO_DONTLINGER		/* Compatibility item... */
-	if (optname == SO_DONTLINGER) {
-		lock_sock(sk);
-		sock_reset_flag(sk, SOCK_LINGER);
-		release_sock(sk);
-		return 0;
-	}
-#endif
-
 	if (optname == SO_BINDTODEVICE)
 		return sock_bindtodevice(sk, optval, optlen);