Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next into for-davem

Conflicts:
	drivers/net/wireless/brcm80211/brcmfmac/sdio_host.h

1 files changed, 14 insertions, 9 deletions

diff --git a/net/bluetooth/af_bluetooth.c b/net/bluetooth/af_bluetooth.c
index e6e1278dca89..1f1a1118f489 100644
--- a/net/bluetooth/af_bluetooth.c
+++ b/net/bluetooth/af_bluetooth.c
@@ -30,7 +30,7 @@
 #include <net/bluetooth/bluetooth.h>
 #include <linux/proc_fs.h>
 
-#define VERSION "2.16"
+#define VERSION "2.17"
 
 /* Bluetooth sockets */
 #define BT_MAX_PROTO    8
@@ -221,12 +221,12 @@ int bt_sock_recvmsg(struct kiocb *iocb, struct socket *sock,
         if (flags & (MSG_OOB))
                 return -EOPNOTSUPP;
 
-        msg->msg_namelen = 0;
-
         skb = skb_recv_datagram(sk, flags, noblock, &err);
         if (!skb) {
-                if (sk->sk_shutdown & RCV_SHUTDOWN)
+                if (sk->sk_shutdown & RCV_SHUTDOWN) {
+                        msg->msg_namelen = 0;
                         return 0;
+                }
                 return err;
         }
 
@@ -238,9 +238,16 @@ int bt_sock_recvmsg(struct kiocb *iocb, struct socket *sock,
 
         skb_reset_transport_header(skb);
         err = skb_copy_datagram_iovec(skb, 0, msg->msg_iov, copied);
-        if (err == 0)
+        if (err == 0) {
                 sock_recv_ts_and_drops(msg, sk, skb);
 
+                if (bt_sk(sk)->skb_msg_name)
+                        bt_sk(sk)->skb_msg_name(skb, msg->msg_name,
+                                                &msg->msg_namelen);
+                else
+                        msg->msg_namelen = 0;
+        }
+
         skb_free_datagram(sk, skb);
 
         return err ? : copied;
@@ -604,7 +611,7 @@ static int bt_seq_show(struct seq_file *seq, void *v)
         struct bt_sock_list *l = s->l;
 
         if (v == SEQ_START_TOKEN) {
-                seq_puts(seq ,"sk               RefCnt Rmem   Wmem   User   Inode  Src Dst Parent");
+                seq_puts(seq ,"sk               RefCnt Rmem   Wmem   User   Inode  Parent");
 
                 if (l->custom_seq_show) {
                         seq_putc(seq, ' ');
@@ -617,15 +624,13 @@ static int bt_seq_show(struct seq_file *seq, void *v)
                 struct bt_sock *bt = bt_sk(sk);
 
                 seq_printf(seq,
-                           "%pK %-6d %-6u %-6u %-6u %-6lu %pMR %pMR %-6lu",
+                           "%pK %-6d %-6u %-6u %-6u %-6lu %-6lu",
                            sk,
                            atomic_read(&sk->sk_refcnt),
                            sk_rmem_alloc_get(sk),
                            sk_wmem_alloc_get(sk),
                            from_kuid(seq_user_ns(seq), sock_i_uid(sk)),
                            sock_i_ino(sk),
-                           &bt->src,
-                           &bt->dst,
                            bt->parent? sock_i_ino(bt->parent): 0LU);
 
                 if (l->custom_seq_show) {