diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-04-14 19:13:28 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-04-14 19:13:28 -0700 |
| commit | 11b397e6eb12191300ca19290f29f51f61118953 (patch) | |
| tree | 6e0f8cb52cbcdb02108755f3d643a025a943bd79 /net/irda | |
| parent | e1c969f7814dcd23bbfe8d777544321a492b6fee (diff) | |
| parent | 41ef2d5678d83af030125550329b6ae8b74618fa (diff) | |
| download | op-kernel-dev-11b397e6eb12191300ca19290f29f51f61118953.zip op-kernel-dev-11b397e6eb12191300ca19290f29f51f61118953.tar.gz | |
Merge 3.9-rc7 intp tty-next
We want the fixes here.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'net/irda')
| -rw-r--r-- | net/irda/af_irda.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/net/irda/af_irda.c b/net/irda/af_irda.c index d28e7f0..e493b33 100644 --- a/net/irda/af_irda.c +++ b/net/irda/af_irda.c @@ -1386,6 +1386,8 @@ static int irda_recvmsg_dgram(struct kiocb *iocb, struct socket *sock, IRDA_DEBUG(4, "%s()\n", __func__); + msg->msg_namelen = 0; + skb = skb_recv_datagram(sk, flags & ~MSG_DONTWAIT, flags & MSG_DONTWAIT, &err); if (!skb) |
