Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi...

[~andy/linux] / net / bluetooth / hci_core.c

diff --git a/net/bluetooth/hci_core.c b/net/bluetooth/hci_core.c
index 979556a2649af9867881c492595462b0ed9dfc6b..08994ecc3b6a5e7cc168ee7cd957a38c49d2e579 100644 (file)
--- a/net/bluetooth/hci_core.c
+++ b/net/bluetooth/hci_core.c
@@ -1526,6 +1526,7 @@ static void le_scan_enable_req(struct hci_dev *hdev, unsigned long opt)
 
        memset(&cp, 0, sizeof(cp));
        cp.enable = 1;
+       cp.filter_dup = 1;
 
        hci_send_cmd(hdev, HCI_OP_LE_SET_SCAN_ENABLE, sizeof(cp), &cp);
 }
@@ -2306,7 +2307,7 @@ static void hci_link_tx_to(struct hci_dev *hdev, __u8 type)
                if (c->type == type && c->sent) {
                        BT_ERR("%s killing stalled connection %s",
                               hdev->name, batostr(&c->dst));
-                       hci_acl_disconn(c, 0x13);
+                       hci_acl_disconn(c, HCI_ERROR_REMOTE_USER_TERM);
                }
        }