Merge branch 'for-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetoot...
authorDavid S. Miller <davem@davemloft.net>
Mon, 25 Feb 2019 06:27:19 +0000 (22:27 -0800)
committerDavid S. Miller <davem@davemloft.net>
Mon, 25 Feb 2019 06:27:19 +0000 (22:27 -0800)
Johan Hedberg says:

====================
Here's the main bluetooth-next pull request for the 5.1 kernel.

 - Fixes & improvements to mediatek, hci_qca, btrtl, and btmrvl HCI drivers
 - Fixes to parsing invalid L2CAP config option sizes
 - Locking fix to bt_accept_enqueue()
 - Add support for new Marvel sd8977 chipset
 - Various other smaller fixes & cleanups
====================

Signed-off-by: David S. Miller <davem@davemloft.net>
1  2 
net/bluetooth/hci_sock.c

diff --combined net/bluetooth/hci_sock.c
index 65228bfa44872113f9a28586463bee1e7f9ca945,d4e2a166ae17685f7445729adf4423c0fbd669b6..d32077b284337ff4086701b0fa5817a173e09d03
@@@ -831,8 -831,6 +831,6 @@@ static int hci_sock_release(struct sock
        if (!sk)
                return 0;
  
-       hdev = hci_pi(sk)->hdev;
        switch (hci_pi(sk)->channel) {
        case HCI_CHANNEL_MONITOR:
                atomic_dec(&monitor_promisc);
  
        bt_sock_unlink(&hci_sk_list, sk);
  
+       hdev = hci_pi(sk)->hdev;
        if (hdev) {
                if (hci_pi(sk)->channel == HCI_CHANNEL_USER) {
                        /* When releasing a user channel exclusive access,
@@@ -1383,9 -1382,9 +1382,9 @@@ static void hci_sock_cmsg(struct sock *
  
        if (mask & HCI_CMSG_TSTAMP) {
  #ifdef CONFIG_COMPAT
 -              struct compat_timeval ctv;
 +              struct old_timeval32 ctv;
  #endif
 -              struct timeval tv;
 +              struct __kernel_old_timeval tv;
                void *data;
                int len;