diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-04-22 02:20:53 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-04-22 02:20:53 +0200 |
| commit | 8a3227268877b81096d7b7a841aaf51099ad2068 (patch) | |
| tree | 73d2b9522aa981d46040b5603c824583c1b18694 /net | |
| parent | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/juh... (diff) | |
| parent | [SPARC]: Remove SunOS and Solaris binary support. (diff) | |
| download | linux-8a3227268877b81096d7b7a841aaf51099ad2068.tar.xz linux-8a3227268877b81096d7b7a841aaf51099ad2068.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6:
[SPARC]: Remove SunOS and Solaris binary support.
Diffstat (limited to 'net')
| -rw-r--r-- | net/core/sock.c | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/net/core/sock.c b/net/core/sock.c index 5ac052693554..5dbb81bc9673 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); |