diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2008-04-01 00:22:26 -0400 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2008-04-01 00:22:26 -0400 |
| commit | 399f486286f44d55c4fff0e9cc5d712f2b443489 (patch) | |
| tree | 0c2820b3e04232eaa96f08c1057b87728fb3e7a4 /arch/sparc | |
| parent | 481419ec9fbdf3f4ec5389c7e91a81b4a7ebee8d (diff) | |
| parent | a9edadbf790d72adf6ebed476cb5caf7743e7e4a (diff) | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6 into for-linus
Diffstat (limited to 'arch/sparc')
| -rw-r--r-- | arch/sparc/kernel/sys_sunos.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/sparc/kernel/sys_sunos.c b/arch/sparc/kernel/sys_sunos.c index 28c187c5d9fd..f5b608bbe8af 100644 --- a/arch/sparc/kernel/sys_sunos.c +++ b/arch/sparc/kernel/sys_sunos.c | |||
| @@ -659,7 +659,7 @@ sunos_nfs_get_server_fd (int fd, struct sockaddr_in *addr) | |||
| 659 | 659 | ||
| 660 | socket = SOCKET_I(inode); | 660 | socket = SOCKET_I(inode); |
| 661 | local.sin_family = AF_INET; | 661 | local.sin_family = AF_INET; |
| 662 | local.sin_addr.s_addr = INADDR_ANY; | 662 | local.sin_addr.s_addr = htonl(INADDR_ANY); |
| 663 | 663 | ||
| 664 | /* IPPORT_RESERVED = 1024, can't find the definition in the kernel */ | 664 | /* IPPORT_RESERVED = 1024, can't find the definition in the kernel */ |
| 665 | try_port = 1024; | 665 | try_port = 1024; |