Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

[firefly-linux-kernel-4.4.55.git] / net / ieee802154 / dgram.c

diff --git a/net/ieee802154/dgram.c b/net/ieee802154/dgram.c
index e0da175f8e5b7962b7906531ebee6e0650bf7a73..581a59504bd5f49d9a54584f3441c4e323b7bcd5 100644 (file)
--- a/net/ieee802154/dgram.c
+++ b/net/ieee802154/dgram.c
@@ -291,6 +291,9 @@ static int dgram_recvmsg(struct kiocb *iocb, struct sock *sk,
        size_t copied = 0;
        int err = -EOPNOTSUPP;
        struct sk_buff *skb;
+       struct sockaddr_ieee802154 *saddr;
+
+       saddr = (struct sockaddr_ieee802154 *)msg->msg_name;
 
        skb = skb_recv_datagram(sk, flags, noblock, &err);
        if (!skb)
@@ -309,6 +312,13 @@ static int dgram_recvmsg(struct kiocb *iocb, struct sock *sk,
 
        sock_recv_ts_and_drops(msg, sk, skb);
 
+       if (saddr) {
+               saddr->family = AF_IEEE802154;
+               saddr->addr = mac_cb(skb)->sa;
+       }
+       if (addr_len)
+               *addr_len = sizeof(*saddr);
+
        if (flags & MSG_TRUNC)
                copied = skb->len;
 done: