diff options
| author | David S. Miller <davem@davemloft.net> | 2008-12-02 22:50:27 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-12-02 22:50:27 -0500 |
| commit | aa2ba5f1082dc705745899584aac8416d710c056 (patch) | |
| tree | bde0bf4aff036c6bac19a0212194ae1092afb3c9 /net/unix/af_unix.c | |
| parent | 68024541e2e5a8f35e281daaa5068a29e2a538a5 (diff) | |
| parent | f6f7b52e2f6149d2ee365717afff315b05720162 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/ixgbe/ixgbe_main.c
drivers/net/smc91x.c
Diffstat (limited to 'net/unix/af_unix.c')
| -rw-r--r-- | net/unix/af_unix.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/net/unix/af_unix.c b/net/unix/af_unix.c index 5aaf23e43f1d..92f52abd3515 100644 --- a/net/unix/af_unix.c +++ b/net/unix/af_unix.c | |||
| @@ -1351,6 +1351,7 @@ static int unix_dgram_sendmsg(struct kiocb *kiocb, struct socket *sock, | |||
| 1351 | 1351 | ||
| 1352 | if (NULL == siocb->scm) | 1352 | if (NULL == siocb->scm) |
| 1353 | siocb->scm = &tmp_scm; | 1353 | siocb->scm = &tmp_scm; |
| 1354 | wait_for_unix_gc(); | ||
| 1354 | err = scm_send(sock, msg, siocb->scm); | 1355 | err = scm_send(sock, msg, siocb->scm); |
| 1355 | if (err < 0) | 1356 | if (err < 0) |
| 1356 | return err; | 1357 | return err; |
| @@ -1501,6 +1502,7 @@ static int unix_stream_sendmsg(struct kiocb *kiocb, struct socket *sock, | |||
| 1501 | 1502 | ||
| 1502 | if (NULL == siocb->scm) | 1503 | if (NULL == siocb->scm) |
| 1503 | siocb->scm = &tmp_scm; | 1504 | siocb->scm = &tmp_scm; |
| 1505 | wait_for_unix_gc(); | ||
| 1504 | err = scm_send(sock, msg, siocb->scm); | 1506 | err = scm_send(sock, msg, siocb->scm); |
| 1505 | if (err < 0) | 1507 | if (err < 0) |
| 1506 | return err; | 1508 | return err; |