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 /fs | |
| 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 'fs')
| -rw-r--r-- | fs/nfs/super.c | 2 | ||||
| -rw-r--r-- | fs/proc/base.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/fs/nfs/super.c b/fs/nfs/super.c index fcf4b982c885..dd4dfcd632ec 100644 --- a/fs/nfs/super.c +++ b/fs/nfs/super.c | |||
| @@ -632,7 +632,7 @@ static int nfs_verify_server_address(struct sockaddr *addr) | |||
| 632 | switch (addr->sa_family) { | 632 | switch (addr->sa_family) { |
| 633 | case AF_INET: { | 633 | case AF_INET: { |
| 634 | struct sockaddr_in *sa = (struct sockaddr_in *)addr; | 634 | struct sockaddr_in *sa = (struct sockaddr_in *)addr; |
| 635 | return sa->sin_addr.s_addr != INADDR_ANY; | 635 | return sa->sin_addr.s_addr != htonl(INADDR_ANY); |
| 636 | } | 636 | } |
| 637 | case AF_INET6: { | 637 | case AF_INET6: { |
| 638 | struct in6_addr *sa = &((struct sockaddr_in6 *)addr)->sin6_addr; | 638 | struct in6_addr *sa = &((struct sockaddr_in6 *)addr)->sin6_addr; |
diff --git a/fs/proc/base.c b/fs/proc/base.c index 8a10f6fe24a1..81d7d145292a 100644 --- a/fs/proc/base.c +++ b/fs/proc/base.c | |||
| @@ -2290,7 +2290,7 @@ static const struct pid_entry tgid_base_stuff[] = { | |||
| 2290 | DIR("fd", S_IRUSR|S_IXUSR, fd), | 2290 | DIR("fd", S_IRUSR|S_IXUSR, fd), |
| 2291 | DIR("fdinfo", S_IRUSR|S_IXUSR, fdinfo), | 2291 | DIR("fdinfo", S_IRUSR|S_IXUSR, fdinfo), |
| 2292 | #ifdef CONFIG_NET | 2292 | #ifdef CONFIG_NET |
| 2293 | DIR("net", S_IRUGO|S_IXUSR, net), | 2293 | DIR("net", S_IRUGO|S_IXUGO, net), |
| 2294 | #endif | 2294 | #endif |
| 2295 | REG("environ", S_IRUSR, environ), | 2295 | REG("environ", S_IRUSR, environ), |
| 2296 | INF("auxv", S_IRUSR, pid_auxv), | 2296 | INF("auxv", S_IRUSR, pid_auxv), |