diff options
| author | Shawn Guo <[email protected]> | 2012-09-17 15:10:58 +0800 |
|---|---|---|
| committer | Shawn Guo <[email protected]> | 2012-09-17 15:10:58 +0800 |
| commit | 8f71fb87e288c5f374ea0e0ddac18707b6649f72 (patch) | |
| tree | dd77032ddcfcfe995436031281eb008a471cfc30 /net/unix/af_unix.c | |
| parent | d9875690d9b89a866022ff49e3fcea892345ad92 (diff) | |
| parent | f8135a74df53ba7010a162dddd112b73ee5652e3 (diff) | |
Merge tag 'imx-dt-3.7' into imx/dt-for-3.7-2
Diffstat (limited to 'net/unix/af_unix.c')
| -rw-r--r-- | net/unix/af_unix.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/unix/af_unix.c b/net/unix/af_unix.c index e4768c180da2..c5ee4ff61364 100644 --- a/net/unix/af_unix.c +++ b/net/unix/af_unix.c @@ -1450,7 +1450,7 @@ static int unix_dgram_sendmsg(struct kiocb *kiocb, struct socket *sock, if (NULL == siocb->scm) siocb->scm = &tmp_scm; wait_for_unix_gc(); - err = scm_send(sock, msg, siocb->scm); + err = scm_send(sock, msg, siocb->scm, false); if (err < 0) return err; @@ -1619,7 +1619,7 @@ static int unix_stream_sendmsg(struct kiocb *kiocb, struct socket *sock, if (NULL == siocb->scm) siocb->scm = &tmp_scm; wait_for_unix_gc(); - err = scm_send(sock, msg, siocb->scm); + err = scm_send(sock, msg, siocb->scm, false); if (err < 0) return err; |