mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-29 11:11:45 -04:00
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.
This commit is contained in:
commit
8a32272688
76 changed files with 172 additions and 11625 deletions
|
|
@ -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);
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue