lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Browse Source 
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6:
  [SPARC]: Remove SunOS and Solaris binary support.
This commit is contained in:
Linus Torvalds
2008-04-21 17:20:53 -07:00
parent e9b62693ae ec98c6b9b4
commit 8a32272688
76 changed files with 174 additions and 11627 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
net/core/sock.c
View File

@@ -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);