diff options
| author | Gustavo F. Padovan | 2011-06-09 21:33:54 +0200 |
|---|---|---|
| committer | Gustavo F. Padovan | 2011-06-09 21:33:54 +0200 |
| commit | 448f2627c169092d2091a1be22feb6a7775f6201 (patch) | |
| tree | 8d12460ba978d4f031715ae4bd9e0bc6fee4c5ab /net/bluetooth/hci_event.c | |
| parent | Bluetooth: Clean up some code style issues (diff) | |
| parent | Bluetooth: Do not send SET_EVENT_MASK for 1.1 and earlier devices (diff) | |
| download | kernel-qcow2-linux-448f2627c169092d2091a1be22feb6a7775f6201.tar.gz kernel-qcow2-linux-448f2627c169092d2091a1be22feb6a7775f6201.tar.xz kernel-qcow2-linux-448f2627c169092d2091a1be22feb6a7775f6201.zip | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/padovan/bluetooth-2.6
Conflicts:
net/bluetooth/rfcomm/sock.c
Diffstat (limited to 'net/bluetooth/hci_event.c')
| -rw-r--r-- | net/bluetooth/hci_event.c | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/net/bluetooth/hci_event.c b/net/bluetooth/hci_event.c index afee4ac1008b..0f643f84131f 100644 --- a/net/bluetooth/hci_event.c +++ b/net/bluetooth/hci_event.c @@ -477,14 +477,16 @@ static void hci_setup_event_mask(struct hci_dev *hdev) * command otherwise */ u8 events[8] = { 0xff, 0xff, 0xfb, 0xff, 0x00, 0x00, 0x00, 0x00 }; - /* Events for 1.2 and newer controllers */ - if (hdev->lmp_ver > 1) { - events[4] |= 0x01; /* Flow Specification Complete */ - events[4] |= 0x02; /* Inquiry Result with RSSI */ - events[4] |= 0x04; /* Read Remote Extended Features Complete */ - events[5] |= 0x08; /* Synchronous Connection Complete */ - events[5] |= 0x10; /* Synchronous Connection Changed */ - } + /* CSR 1.1 dongles does not accept any bitfield so don't try to set + * any event mask for pre 1.2 devices */ + if (hdev->lmp_ver <= 1) + return; + + events[4] |= 0x01; /* Flow Specification Complete */ + events[4] |= 0x02; /* Inquiry Result with RSSI */ + events[4] |= 0x04; /* Read Remote Extended Features Complete */ + events[5] |= 0x08; /* Synchronous Connection Complete */ + events[5] |= 0x10; /* Synchronous Connection Changed */ if (hdev->features[3] & LMP_RSSI_INQ) events[4] |= 0x04; /* Inquiry Result with RSSI */ |