The following commit has been merged in the batman-adv/next branch: commit 45db810fb71a94926c10f4dbbb5ca7913983f83b Author: Andre Guedes andre.guedes@openbossa.org Date: Tue Jul 24 15:03:49 2012 -0300
Bluetooth: Use lmp_esco_capable where applicable
This patch replaces all LMP_ESCO bit checking by the helper macro lmp_esco_capable.
Signed-off-by: Andre Guedes andre.guedes@openbossa.org Signed-off-by: Gustavo Padovan gustavo.padovan@collabora.co.uk
diff --git a/net/bluetooth/hci_event.c b/net/bluetooth/hci_event.c index b120388..5722a38 100644 --- a/net/bluetooth/hci_event.c +++ b/net/bluetooth/hci_event.c @@ -686,7 +686,7 @@ static void hci_cc_read_local_features(struct hci_dev *hdev, hdev->esco_type |= (ESCO_HV3); }
- if (hdev->features[3] & LMP_ESCO) + if (lmp_esco_capable(hdev)) hdev->esco_type |= (ESCO_EV3);
if (hdev->features[4] & LMP_EV4)