Merge branch 'for-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth-next

Johan Hedberg says:

====================
pull request: bluetooth-next 2018-02-15

Here's the first bluetooth-next pull request targetting the 4.17 kernel
release.

 - Fixes & cleanups to Atheros and Marvell drivers
 - Support for two new Realtek controllers
 - Support for new Intel Bluetooth controller
 - Fix for supporting multiple slave-role Bluetooth LE connections
====================

Signed-off-by: David S. Miller <davem@davemloft.net>

1 files changed, 3 insertions, 3 deletions

diff --git a/net/bluetooth/hci_request.c b/net/bluetooth/hci_request.c
index 3394e6791673..66c0781773df 100644
--- a/net/bluetooth/hci_request.c
+++ b/net/bluetooth/hci_request.c
@@ -934,8 +934,8 @@ static bool is_advertising_allowed(struct hci_dev *hdev, bool connectable)
                 /* Slave connection state and connectable mode bit 38
                  * and scannable bit 21.
                  */
-                if (connectable && (!(hdev->le_states[4] & 0x01) ||
-                                    !(hdev->le_states[2] & 0x40)))
+                if (connectable && (!(hdev->le_states[4] & 0x40) ||
+                                    !(hdev->le_states[2] & 0x20)))
                         return false;
         }
 
@@ -948,7 +948,7 @@ static bool is_advertising_allowed(struct hci_dev *hdev, bool connectable)
                 /* Master connection state and connectable mode bit 35 and
                  * scannable 19.
                  */
-                if (connectable && (!(hdev->le_states[4] & 0x10) ||
+                if (connectable && (!(hdev->le_states[4] & 0x08) ||
                                     !(hdev->le_states[2] & 0x08)))
                         return false;
         }