diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-03-21 10:57:45 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-03-21 10:57:45 -0400 |
| commit | 7d3628b230ecbdc29566c18bc7800ff8ed66a71f (patch) | |
| tree | eac1bff40bdb655fdfdeaf1e22ce12a81296f1fb /arch | |
| parent | 2c7871982cf27caaddbaeb7e2121ce1374b520ff (diff) | |
| parent | 94833dfb8c98ed4ca1944dd2c1339d88a2d1c758 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6: (46 commits)
[NET] ifb: set separate lockdep classes for queue locks
[IPV6] KCONFIG: Fix description about IPV6_TUNNEL.
[TCP]: Fix shrinking windows with window scaling
netpoll: zap_completion_queue: adjust skb->users counter
bridge: use time_before() in br_fdb_cleanup()
[TG3]: Fix build warning on sparc32.
MAINTAINERS: bluez-devel is subscribers-only
audit: netlink socket can be auto-bound to pid other than current->pid (v2)
[NET]: Fix permissions of /proc/net
[SCTP]: Fix a race between module load and protosw access
[NETFILTER]: ipt_recent: sanity check hit count
[NETFILTER]: nf_conntrack_h323: logical-bitwise & confusion in process_setup()
[RT2X00] drivers/net/wireless/rt2x00/rt2x00dev.c: remove dead code, fix warning
[IPV4]: esp_output() misannotations
[8021Q]: vlan_dev misannotations
xfrm: ->eth_proto is __be16
[IPV4]: ipv4_is_lbcast() misannotations
[SUNRPC]: net/* NULL noise
[SCTP]: fix misannotated __sctp_rcv_asconf_lookup()
[PKT_SCHED]: annotate cls_u32
...
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/sparc/kernel/sys_sunos.c | 2 | ||||
| -rw-r--r-- | arch/sparc64/kernel/sys_sunos32.c | 2 |
2 files changed, 2 insertions, 2 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; |
diff --git a/arch/sparc64/kernel/sys_sunos32.c b/arch/sparc64/kernel/sys_sunos32.c index cfc22d3fe54c..e91194fe39d7 100644 --- a/arch/sparc64/kernel/sys_sunos32.c +++ b/arch/sparc64/kernel/sys_sunos32.c | |||
| @@ -618,7 +618,7 @@ sunos_nfs_get_server_fd (int fd, struct sockaddr_in *addr) | |||
| 618 | 618 | ||
| 619 | socket = SOCKET_I(inode); | 619 | socket = SOCKET_I(inode); |
| 620 | local.sin_family = AF_INET; | 620 | local.sin_family = AF_INET; |
| 621 | local.sin_addr.s_addr = INADDR_ANY; | 621 | local.sin_addr.s_addr = htonl(INADDR_ANY); |
| 622 | 622 | ||
| 623 | /* IPPORT_RESERVED = 1024, can't find the definition in the kernel */ | 623 | /* IPPORT_RESERVED = 1024, can't find the definition in the kernel */ |
| 624 | try_port = 1024; | 624 | try_port = 1024; |