The following commit has been merged in the batman-adv/next branch: commit c58e810eb0916f9197378435af72136fb7c97f43 Author: Andre Guedes andre.guedes@openbossa.org Date: Tue Jul 24 15:03:53 2012 -0300

Bluetooth: Use lmp_no_flush_capable where applicable

This patch replaces all LMP_NO_FLUSH bit checking by the helper macro lmp_no_flush_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 060780c..2d8761b 100644 --- a/net/bluetooth/hci_event.c +++ b/net/bluetooth/hci_event.c @@ -522,7 +522,7 @@ static void hci_setup_event_mask(struct hci_dev *hdev) if (hdev->features[6] & LMP_EXT_INQ) events[5] |= 0x40; /* Extended Inquiry Result */

- if (hdev->features[6] & LMP_NO_FLUSH) + if (lmp_no_flush_capable(hdev)) events[7] |= 0x01; /* Enhanced Flush Complete */

if (hdev->features[7] & LMP_LSTO)