From: Johan Hedberg Date: Tue, 28 Oct 2014 21:23:27 +0000 (+0100) Subject: Bluetooth: Fix check for direct advertising X-Git-Tag: v3.19-rc1~118^2~234^2~3^2~39 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=0b1db38ca26b322296cbd141f3080eccfe1cc3e1;p=karo-tx-linux.git Bluetooth: Fix check for direct advertising These days we allow simultaneous LE scanning and advertising. Checking for whether advertising is enabled or not is therefore not a reliable way to determine whether directed advertising was used to trigger the connection creation. The appropriate place to check (instead of the hdev context) is the connection role that's stored in the hci_conn. This patch fixes such a check in le_conn_timeout() which could otherwise lead to incorrect HCI commands being sent. Signed-off-by: Johan Hedberg Signed-off-by: Marcel Holtmann Cc: stable@vger.kernel.org # 3.16.x --- diff --git a/net/bluetooth/hci_conn.c b/net/bluetooth/hci_conn.c index 74b8e2421e96..96887ae8375b 100644 --- a/net/bluetooth/hci_conn.c +++ b/net/bluetooth/hci_conn.c @@ -416,7 +416,7 @@ static void le_conn_timeout(struct work_struct *work) * happen with broken hardware or if low duty cycle was used * (which doesn't have a timeout of its own). */ - if (test_bit(HCI_ADVERTISING, &hdev->dev_flags)) { + if (conn->role == HCI_ROLE_SLAVE) { u8 enable = 0x00; hci_send_cmd(hdev, HCI_OP_LE_SET_ADV_ENABLE, sizeof(enable), &enable);