diff options
| author | David S. Miller <davem@davemloft.net> | 2008-11-07 01:43:03 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-11-07 01:43:03 -0500 |
| commit | 9eeda9abd1faf489f3df9a1f557975f4c8650363 (patch) | |
| tree | 3e0a58e25b776cfbee193195460324dccb1886c7 /net/unix | |
| parent | 61c9eaf90081cbe6dc4f389e0056bff76eca19ec (diff) | |
| parent | 4bab0ea1d42dd1927af9df6fbf0003fc00617c50 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/wireless/ath5k/base.c
net/8021q/vlan_core.c
Diffstat (limited to 'net/unix')
| -rw-r--r-- | net/unix/af_unix.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/unix/af_unix.c b/net/unix/af_unix.c index 0b80634b2b72..7d2e4f8f8172 100644 --- a/net/unix/af_unix.c +++ b/net/unix/af_unix.c | |||
| @@ -2212,7 +2212,7 @@ static int unix_net_init(struct net *net) | |||
| 2212 | #endif | 2212 | #endif |
| 2213 | error = 0; | 2213 | error = 0; |
| 2214 | out: | 2214 | out: |
| 2215 | return 0; | 2215 | return error; |
| 2216 | } | 2216 | } |
| 2217 | 2217 | ||
| 2218 | static void unix_net_exit(struct net *net) | 2218 | static void unix_net_exit(struct net *net) |