Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6

[net-next-2.6.git] / net / core / sock.c

diff --git a/net/core/sock.c b/net/core/sock.c
index 5ac05269355474dafda721357934be004a52ac3d..5dbb81bc96733d260e97c9c573acde9260b58174 100644 (file)
--- 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);