diff options
| author | Alex Shi <alex.shi@linaro.org> | 2015-03-30 11:38:40 +0800 |
|---|---|---|
| committer | Alex Shi <alex.shi@linaro.org> | 2015-03-30 11:38:40 +0800 |
| commit | 88720d8b842c59efcc0c4dc17e2107f4dae502f5 (patch) | |
| tree | 967e60ace88cd9e4f9819042eedf3be6a445bb54 /net/caif/caif_socket.c | |
| parent | ba0bfedf4c9cad58f56a7038d1462ffc21cd33df (diff) | |
| parent | 73895725a9401bd3454757fcfa7d691270ac7498 (diff) | |
Merge tag 'v3.10.73' into linux-linaro-lskHEADlinux-linaro-lsk
This is the 3.10.73 stable release
Diffstat (limited to 'net/caif/caif_socket.c')
| -rw-r--r-- | net/caif/caif_socket.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/caif/caif_socket.c b/net/caif/caif_socket.c index d6be3edb7a43..526bf56f4d31 100644 --- a/net/caif/caif_socket.c +++ b/net/caif/caif_socket.c @@ -283,7 +283,7 @@ static int caif_seqpkt_recvmsg(struct kiocb *iocb, struct socket *sock, int copylen; ret = -EOPNOTSUPP; - if (m->msg_flags&MSG_OOB) + if (flags & MSG_OOB) goto read_error; skb = skb_recv_datagram(sk, flags, 0 , &ret); |