aboutsummaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2008-04-21 20:20:53 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2008-04-21 20:20:53 -0400
commit8a3227268877b81096d7b7a841aaf51099ad2068 (patch)
tree73d2b9522aa981d46040b5603c824583c1b18694 /net
parente9b62693ae0a1e13ccc97a6792d9a7770c8d1b5b (diff)
parentec98c6b9b47df6df1c1fa6cf3d427414f8c2cf16 (diff)
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.c9
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,
450 * Options without arguments 450 * Options without arguments
451 */ 451 */
452 452
453#ifdef SO_DONTLINGER /* Compatibility item... */
454 if (optname == SO_DONTLINGER) {
455 lock_sock(sk);
456 sock_reset_flag(sk, SOCK_LINGER);
457 release_sock(sk);
458 return 0;
459 }
460#endif
461
462 if (optname == SO_BINDTODEVICE) 453 if (optname == SO_BINDTODEVICE)
463 return sock_bindtodevice(sk, optval, optlen); 454 return sock_bindtodevice(sk, optval, optlen);
464 455