diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2012-01-13 10:00:22 -0500 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2012-01-13 10:00:22 -0500 |
| commit | 4de3a8e101150feaefa1139611a50ff37467f33e (patch) | |
| tree | daada742542518b02d7db7c5d32e715eaa5f166d /net/unix | |
| parent | 294064f58953f9964e5945424b09c51800330a83 (diff) | |
| parent | 099469502f62fbe0d7e4f0b83a2f22538367f734 (diff) | |
Merge branch 'master' into fixes
Diffstat (limited to 'net/unix')
| -rw-r--r-- | net/unix/Kconfig | 2 | ||||
| -rw-r--r-- | net/unix/af_unix.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/net/unix/Kconfig b/net/unix/Kconfig index c2128b10e5f9..8b31ab85d050 100644 --- a/net/unix/Kconfig +++ b/net/unix/Kconfig | |||
| @@ -22,7 +22,7 @@ config UNIX | |||
| 22 | config UNIX_DIAG | 22 | config UNIX_DIAG |
| 23 | tristate "UNIX: socket monitoring interface" | 23 | tristate "UNIX: socket monitoring interface" |
| 24 | depends on UNIX | 24 | depends on UNIX |
| 25 | default UNIX | 25 | default n |
| 26 | ---help--- | 26 | ---help--- |
| 27 | Support for UNIX socket monitoring interface used by the ss tool. | 27 | Support for UNIX socket monitoring interface used by the ss tool. |
| 28 | If unsure, say Y. | 28 | If unsure, say Y. |
diff --git a/net/unix/af_unix.c b/net/unix/af_unix.c index 7cc3d7b23d1c..aad8fb699989 100644 --- a/net/unix/af_unix.c +++ b/net/unix/af_unix.c | |||
| @@ -850,7 +850,7 @@ static int unix_bind(struct socket *sock, struct sockaddr *uaddr, int addr_len) | |||
| 850 | atomic_set(&addr->refcnt, 1); | 850 | atomic_set(&addr->refcnt, 1); |
| 851 | 851 | ||
| 852 | if (sun_path[0]) { | 852 | if (sun_path[0]) { |
| 853 | unsigned int mode; | 853 | umode_t mode; |
| 854 | err = 0; | 854 | err = 0; |
| 855 | /* | 855 | /* |
| 856 | * Get the parent directory, calculate the hash for last | 856 | * Get the parent directory, calculate the hash for last |