aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Salyzyn <salyzyn@google.com>2015-05-27 11:08:16 -0700
committerMark Salyzyn <salyzyn@google.com>2015-05-27 11:16:08 -0700
commit5bef589da7d952a04cfdd23bebe5988a966b4b13 (patch)
tree5d52680703c19cae78d62f51e84b4d9a5bdc990d
parent93e24e14287b1afa6b68136724cf37547301f282 (diff)
downloadlinux-linaro-stable-5bef589da7d952a04cfdd23bebe5988a966b4b13.tar.gz
New Build Breakage in branch: kernel-m-dev-tegra-flounder-3.10 @ 1960706
Signed-off-by: Mark Salyzyn <salyzyn@google.com> Change-Id: I5682198bce94e66ff3de52989c7e361ffc25ba52
-rw-r--r--net/unix/af_unix.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/unix/af_unix.c b/net/unix/af_unix.c
index ce8bb5fef3f4..4757f1cf6237 100644
--- a/net/unix/af_unix.c
+++ b/net/unix/af_unix.c
@@ -1961,7 +1961,7 @@ static int unix_stream_recvmsg(struct kiocb *iocb, struct socket *sock,
struct sk_buff *skb, *last;
unix_state_lock(sk);
- if (sock_flag(sg, SOCK_DEAD)) {
+ if (sock_flag(sk, SOCK_DEAD)) {
err = -ECONNRESET;
goto unlock;
}