diff options
Diffstat (limited to 'net/bluetooth/hci_event.c')
-rw-r--r-- | net/bluetooth/hci_event.c | 1651 |
1 files changed, 925 insertions, 726 deletions
diff --git a/net/bluetooth/hci_event.c b/net/bluetooth/hci_event.c index 4baea1e38652..46df2e403df8 100644 --- a/net/bluetooth/hci_event.c +++ b/net/bluetooth/hci_event.c | |||
@@ -52,234 +52,273 @@ | |||
52 | 52 | ||
53 | /* Handle HCI Event packets */ | 53 | /* Handle HCI Event packets */ |
54 | 54 | ||
55 | /* Command Complete OGF LINK_CTL */ | 55 | static void hci_cc_inquiry_cancel(struct hci_dev *hdev, struct sk_buff *skb) |
56 | static void hci_cc_link_ctl(struct hci_dev *hdev, __u16 ocf, struct sk_buff *skb) | ||
57 | { | 56 | { |
58 | __u8 status; | 57 | __u8 status = *((__u8 *) skb->data); |
59 | struct hci_conn *pend; | ||
60 | 58 | ||
61 | BT_DBG("%s ocf 0x%x", hdev->name, ocf); | 59 | BT_DBG("%s status 0x%x", hdev->name, status); |
62 | 60 | ||
63 | switch (ocf) { | 61 | if (status) |
64 | case OCF_INQUIRY_CANCEL: | 62 | return; |
65 | case OCF_EXIT_PERIODIC_INQ: | ||
66 | status = *((__u8 *) skb->data); | ||
67 | 63 | ||
68 | if (status) { | 64 | clear_bit(HCI_INQUIRY, &hdev->flags); |
69 | BT_DBG("%s Inquiry cancel error: status 0x%x", hdev->name, status); | ||
70 | } else { | ||
71 | clear_bit(HCI_INQUIRY, &hdev->flags); | ||
72 | hci_req_complete(hdev, status); | ||
73 | } | ||
74 | 65 | ||
75 | hci_dev_lock(hdev); | 66 | hci_req_complete(hdev, status); |
76 | 67 | ||
77 | pend = hci_conn_hash_lookup_state(hdev, ACL_LINK, BT_CONNECT2); | 68 | hci_conn_check_pending(hdev); |
78 | if (pend) | 69 | } |
79 | hci_acl_connect(pend); | ||
80 | 70 | ||
81 | hci_dev_unlock(hdev); | 71 | static void hci_cc_exit_periodic_inq(struct hci_dev *hdev, struct sk_buff *skb) |
72 | { | ||
73 | __u8 status = *((__u8 *) skb->data); | ||
82 | 74 | ||
83 | break; | 75 | BT_DBG("%s status 0x%x", hdev->name, status); |
84 | 76 | ||
85 | default: | 77 | if (status) |
86 | BT_DBG("%s Command complete: ogf LINK_CTL ocf %x", hdev->name, ocf); | 78 | return; |
87 | break; | 79 | |
80 | clear_bit(HCI_INQUIRY, &hdev->flags); | ||
81 | |||
82 | hci_conn_check_pending(hdev); | ||
83 | } | ||
84 | |||
85 | static void hci_cc_remote_name_req_cancel(struct hci_dev *hdev, struct sk_buff *skb) | ||
86 | { | ||
87 | BT_DBG("%s", hdev->name); | ||
88 | } | ||
89 | |||
90 | static void hci_cc_role_discovery(struct hci_dev *hdev, struct sk_buff *skb) | ||
91 | { | ||
92 | struct hci_rp_role_discovery *rp = (void *) skb->data; | ||
93 | struct hci_conn *conn; | ||
94 | |||
95 | BT_DBG("%s status 0x%x", hdev->name, rp->status); | ||
96 | |||
97 | if (rp->status) | ||
98 | return; | ||
99 | |||
100 | hci_dev_lock(hdev); | ||
101 | |||
102 | conn = hci_conn_hash_lookup_handle(hdev, __le16_to_cpu(rp->handle)); | ||
103 | if (conn) { | ||
104 | if (rp->role) | ||
105 | conn->link_mode &= ~HCI_LM_MASTER; | ||
106 | else | ||
107 | conn->link_mode |= HCI_LM_MASTER; | ||
88 | } | 108 | } |
109 | |||
110 | hci_dev_unlock(hdev); | ||
89 | } | 111 | } |
90 | 112 | ||
91 | /* Command Complete OGF LINK_POLICY */ | 113 | static void hci_cc_write_link_policy(struct hci_dev *hdev, struct sk_buff *skb) |
92 | static void hci_cc_link_policy(struct hci_dev *hdev, __u16 ocf, struct sk_buff *skb) | ||
93 | { | 114 | { |
115 | struct hci_rp_write_link_policy *rp = (void *) skb->data; | ||
94 | struct hci_conn *conn; | 116 | struct hci_conn *conn; |
95 | struct hci_rp_role_discovery *rd; | ||
96 | struct hci_rp_write_link_policy *lp; | ||
97 | void *sent; | 117 | void *sent; |
98 | 118 | ||
99 | BT_DBG("%s ocf 0x%x", hdev->name, ocf); | 119 | BT_DBG("%s status 0x%x", hdev->name, rp->status); |
100 | 120 | ||
101 | switch (ocf) { | 121 | if (rp->status) |
102 | case OCF_ROLE_DISCOVERY: | 122 | return; |
103 | rd = (void *) skb->data; | ||
104 | 123 | ||
105 | if (rd->status) | 124 | sent = hci_sent_cmd_data(hdev, HCI_OP_WRITE_LINK_POLICY); |
106 | break; | 125 | if (!sent) |
126 | return; | ||
107 | 127 | ||
108 | hci_dev_lock(hdev); | 128 | hci_dev_lock(hdev); |
109 | 129 | ||
110 | conn = hci_conn_hash_lookup_handle(hdev, __le16_to_cpu(rd->handle)); | 130 | conn = hci_conn_hash_lookup_handle(hdev, __le16_to_cpu(rp->handle)); |
111 | if (conn) { | 131 | if (conn) { |
112 | if (rd->role) | 132 | __le16 policy = get_unaligned((__le16 *) (sent + 2)); |
113 | conn->link_mode &= ~HCI_LM_MASTER; | 133 | conn->link_policy = __le16_to_cpu(policy); |
114 | else | 134 | } |
115 | conn->link_mode |= HCI_LM_MASTER; | ||
116 | } | ||
117 | 135 | ||
118 | hci_dev_unlock(hdev); | 136 | hci_dev_unlock(hdev); |
119 | break; | 137 | } |
120 | 138 | ||
121 | case OCF_WRITE_LINK_POLICY: | 139 | static void hci_cc_reset(struct hci_dev *hdev, struct sk_buff *skb) |
122 | sent = hci_sent_cmd_data(hdev, OGF_LINK_POLICY, OCF_WRITE_LINK_POLICY); | 140 | { |
123 | if (!sent) | 141 | __u8 status = *((__u8 *) skb->data); |
124 | break; | ||
125 | 142 | ||
126 | lp = (struct hci_rp_write_link_policy *) skb->data; | 143 | BT_DBG("%s status 0x%x", hdev->name, status); |
127 | 144 | ||
128 | if (lp->status) | 145 | hci_req_complete(hdev, status); |
129 | break; | 146 | } |
130 | 147 | ||
131 | hci_dev_lock(hdev); | 148 | static void hci_cc_write_local_name(struct hci_dev *hdev, struct sk_buff *skb) |
149 | { | ||
150 | __u8 status = *((__u8 *) skb->data); | ||
151 | void *sent; | ||
132 | 152 | ||
133 | conn = hci_conn_hash_lookup_handle(hdev, __le16_to_cpu(lp->handle)); | 153 | BT_DBG("%s status 0x%x", hdev->name, status); |
134 | if (conn) { | ||
135 | __le16 policy = get_unaligned((__le16 *) (sent + 2)); | ||
136 | conn->link_policy = __le16_to_cpu(policy); | ||
137 | } | ||
138 | 154 | ||
139 | hci_dev_unlock(hdev); | 155 | sent = hci_sent_cmd_data(hdev, HCI_OP_WRITE_LOCAL_NAME); |
140 | break; | 156 | if (!sent) |
157 | return; | ||
141 | 158 | ||
142 | default: | 159 | if (!status) |
143 | BT_DBG("%s: Command complete: ogf LINK_POLICY ocf %x", | 160 | memcpy(hdev->dev_name, sent, 248); |
144 | hdev->name, ocf); | 161 | } |
145 | break; | 162 | |
163 | static void hci_cc_read_local_name(struct hci_dev *hdev, struct sk_buff *skb) | ||
164 | { | ||
165 | struct hci_rp_read_local_name *rp = (void *) skb->data; | ||
166 | |||
167 | BT_DBG("%s status 0x%x", hdev->name, rp->status); | ||
168 | |||
169 | if (rp->status) | ||
170 | return; | ||
171 | |||
172 | memcpy(hdev->dev_name, rp->name, 248); | ||
173 | } | ||
174 | |||
175 | static void hci_cc_write_auth_enable(struct hci_dev *hdev, struct sk_buff *skb) | ||
176 | { | ||
177 | __u8 status = *((__u8 *) skb->data); | ||
178 | void *sent; | ||
179 | |||
180 | BT_DBG("%s status 0x%x", hdev->name, status); | ||
181 | |||
182 | sent = hci_sent_cmd_data(hdev, HCI_OP_WRITE_AUTH_ENABLE); | ||
183 | if (!sent) | ||
184 | return; | ||
185 | |||
186 | if (!status) { | ||
187 | __u8 param = *((__u8 *) sent); | ||
188 | |||
189 | if (param == AUTH_ENABLED) | ||
190 | set_bit(HCI_AUTH, &hdev->flags); | ||
191 | else | ||
192 | clear_bit(HCI_AUTH, &hdev->flags); | ||
146 | } | 193 | } |
194 | |||
195 | hci_req_complete(hdev, status); | ||
147 | } | 196 | } |
148 | 197 | ||
149 | /* Command Complete OGF HOST_CTL */ | 198 | static void hci_cc_write_encrypt_mode(struct hci_dev *hdev, struct sk_buff *skb) |
150 | static void hci_cc_host_ctl(struct hci_dev *hdev, __u16 ocf, struct sk_buff *skb) | ||
151 | { | 199 | { |
152 | __u8 status, param; | 200 | __u8 status = *((__u8 *) skb->data); |
153 | __u16 setting; | ||
154 | struct hci_rp_read_voice_setting *vs; | ||
155 | void *sent; | 201 | void *sent; |
156 | 202 | ||
157 | BT_DBG("%s ocf 0x%x", hdev->name, ocf); | 203 | BT_DBG("%s status 0x%x", hdev->name, status); |
158 | 204 | ||
159 | switch (ocf) { | 205 | sent = hci_sent_cmd_data(hdev, HCI_OP_WRITE_ENCRYPT_MODE); |
160 | case OCF_RESET: | 206 | if (!sent) |
161 | status = *((__u8 *) skb->data); | 207 | return; |
162 | hci_req_complete(hdev, status); | ||
163 | break; | ||
164 | 208 | ||
165 | case OCF_SET_EVENT_FLT: | 209 | if (!status) { |
166 | status = *((__u8 *) skb->data); | 210 | __u8 param = *((__u8 *) sent); |
167 | if (status) { | ||
168 | BT_DBG("%s SET_EVENT_FLT failed %d", hdev->name, status); | ||
169 | } else { | ||
170 | BT_DBG("%s SET_EVENT_FLT succeseful", hdev->name); | ||
171 | } | ||
172 | break; | ||
173 | 211 | ||
174 | case OCF_WRITE_AUTH_ENABLE: | 212 | if (param) |
175 | sent = hci_sent_cmd_data(hdev, OGF_HOST_CTL, OCF_WRITE_AUTH_ENABLE); | 213 | set_bit(HCI_ENCRYPT, &hdev->flags); |
176 | if (!sent) | 214 | else |
177 | break; | 215 | clear_bit(HCI_ENCRYPT, &hdev->flags); |
216 | } | ||
178 | 217 | ||
179 | status = *((__u8 *) skb->data); | 218 | hci_req_complete(hdev, status); |
180 | param = *((__u8 *) sent); | 219 | } |
181 | 220 | ||
182 | if (!status) { | 221 | static void hci_cc_write_scan_enable(struct hci_dev *hdev, struct sk_buff *skb) |
183 | if (param == AUTH_ENABLED) | 222 | { |
184 | set_bit(HCI_AUTH, &hdev->flags); | 223 | __u8 status = *((__u8 *) skb->data); |
185 | else | 224 | void *sent; |
186 | clear_bit(HCI_AUTH, &hdev->flags); | ||
187 | } | ||
188 | hci_req_complete(hdev, status); | ||
189 | break; | ||
190 | 225 | ||
191 | case OCF_WRITE_ENCRYPT_MODE: | 226 | BT_DBG("%s status 0x%x", hdev->name, status); |
192 | sent = hci_sent_cmd_data(hdev, OGF_HOST_CTL, OCF_WRITE_ENCRYPT_MODE); | ||
193 | if (!sent) | ||
194 | break; | ||
195 | 227 | ||
196 | status = *((__u8 *) skb->data); | 228 | sent = hci_sent_cmd_data(hdev, HCI_OP_WRITE_SCAN_ENABLE); |
197 | param = *((__u8 *) sent); | 229 | if (!sent) |
230 | return; | ||
198 | 231 | ||
199 | if (!status) { | 232 | if (!status) { |
200 | if (param) | 233 | __u8 param = *((__u8 *) sent); |
201 | set_bit(HCI_ENCRYPT, &hdev->flags); | ||
202 | else | ||
203 | clear_bit(HCI_ENCRYPT, &hdev->flags); | ||
204 | } | ||
205 | hci_req_complete(hdev, status); | ||
206 | break; | ||
207 | 234 | ||
208 | case OCF_WRITE_CA_TIMEOUT: | 235 | clear_bit(HCI_PSCAN, &hdev->flags); |
209 | status = *((__u8 *) skb->data); | 236 | clear_bit(HCI_ISCAN, &hdev->flags); |
210 | if (status) { | ||
211 | BT_DBG("%s OCF_WRITE_CA_TIMEOUT failed %d", hdev->name, status); | ||
212 | } else { | ||
213 | BT_DBG("%s OCF_WRITE_CA_TIMEOUT succeseful", hdev->name); | ||
214 | } | ||
215 | break; | ||
216 | 237 | ||
217 | case OCF_WRITE_PG_TIMEOUT: | 238 | if (param & SCAN_INQUIRY) |
218 | status = *((__u8 *) skb->data); | 239 | set_bit(HCI_ISCAN, &hdev->flags); |
219 | if (status) { | ||
220 | BT_DBG("%s OCF_WRITE_PG_TIMEOUT failed %d", hdev->name, status); | ||
221 | } else { | ||
222 | BT_DBG("%s: OCF_WRITE_PG_TIMEOUT succeseful", hdev->name); | ||
223 | } | ||
224 | break; | ||
225 | 240 | ||
226 | case OCF_WRITE_SCAN_ENABLE: | 241 | if (param & SCAN_PAGE) |
227 | sent = hci_sent_cmd_data(hdev, OGF_HOST_CTL, OCF_WRITE_SCAN_ENABLE); | 242 | set_bit(HCI_PSCAN, &hdev->flags); |
228 | if (!sent) | 243 | } |
229 | break; | ||
230 | 244 | ||
231 | status = *((__u8 *) skb->data); | 245 | hci_req_complete(hdev, status); |
232 | param = *((__u8 *) sent); | 246 | } |
233 | 247 | ||
234 | BT_DBG("param 0x%x", param); | 248 | static void hci_cc_read_class_of_dev(struct hci_dev *hdev, struct sk_buff *skb) |
249 | { | ||
250 | struct hci_rp_read_class_of_dev *rp = (void *) skb->data; | ||
235 | 251 | ||
236 | if (!status) { | 252 | BT_DBG("%s status 0x%x", hdev->name, rp->status); |
237 | clear_bit(HCI_PSCAN, &hdev->flags); | ||
238 | clear_bit(HCI_ISCAN, &hdev->flags); | ||
239 | if (param & SCAN_INQUIRY) | ||
240 | set_bit(HCI_ISCAN, &hdev->flags); | ||
241 | 253 | ||
242 | if (param & SCAN_PAGE) | 254 | if (rp->status) |
243 | set_bit(HCI_PSCAN, &hdev->flags); | 255 | return; |
244 | } | ||
245 | hci_req_complete(hdev, status); | ||
246 | break; | ||
247 | 256 | ||
248 | case OCF_READ_VOICE_SETTING: | 257 | memcpy(hdev->dev_class, rp->dev_class, 3); |
249 | vs = (struct hci_rp_read_voice_setting *) skb->data; | ||
250 | 258 | ||
251 | if (vs->status) { | 259 | BT_DBG("%s class 0x%.2x%.2x%.2x", hdev->name, |
252 | BT_DBG("%s READ_VOICE_SETTING failed %d", hdev->name, vs->status); | 260 | hdev->dev_class[2], hdev->dev_class[1], hdev->dev_class[0]); |
253 | break; | 261 | } |
254 | } | ||
255 | 262 | ||
256 | setting = __le16_to_cpu(vs->voice_setting); | 263 | static void hci_cc_write_class_of_dev(struct hci_dev *hdev, struct sk_buff *skb) |
264 | { | ||
265 | __u8 status = *((__u8 *) skb->data); | ||
266 | void *sent; | ||
257 | 267 | ||
258 | if (hdev->voice_setting != setting ) { | 268 | BT_DBG("%s status 0x%x", hdev->name, status); |
259 | hdev->voice_setting = setting; | ||
260 | 269 | ||
261 | BT_DBG("%s: voice setting 0x%04x", hdev->name, setting); | 270 | sent = hci_sent_cmd_data(hdev, HCI_OP_WRITE_CLASS_OF_DEV); |
271 | if (!sent) | ||
272 | return; | ||
262 | 273 | ||
263 | if (hdev->notify) { | 274 | if (!status) |
264 | tasklet_disable(&hdev->tx_task); | 275 | memcpy(hdev->dev_class, sent, 3); |
265 | hdev->notify(hdev, HCI_NOTIFY_VOICE_SETTING); | 276 | } |
266 | tasklet_enable(&hdev->tx_task); | ||
267 | } | ||
268 | } | ||
269 | break; | ||
270 | 277 | ||
271 | case OCF_WRITE_VOICE_SETTING: | 278 | static void hci_cc_read_voice_setting(struct hci_dev *hdev, struct sk_buff *skb) |
272 | sent = hci_sent_cmd_data(hdev, OGF_HOST_CTL, OCF_WRITE_VOICE_SETTING); | 279 | { |
273 | if (!sent) | 280 | struct hci_rp_read_voice_setting *rp = (void *) skb->data; |
274 | break; | 281 | __u16 setting; |
282 | |||
283 | BT_DBG("%s status 0x%x", hdev->name, rp->status); | ||
284 | |||
285 | if (rp->status) | ||
286 | return; | ||
287 | |||
288 | setting = __le16_to_cpu(rp->voice_setting); | ||
289 | |||
290 | if (hdev->voice_setting == setting ) | ||
291 | return; | ||
292 | |||
293 | hdev->voice_setting = setting; | ||
275 | 294 | ||
276 | status = *((__u8 *) skb->data); | 295 | BT_DBG("%s voice setting 0x%04x", hdev->name, setting); |
277 | setting = __le16_to_cpu(get_unaligned((__le16 *) sent)); | ||
278 | 296 | ||
279 | if (!status && hdev->voice_setting != setting) { | 297 | if (hdev->notify) { |
298 | tasklet_disable(&hdev->tx_task); | ||
299 | hdev->notify(hdev, HCI_NOTIFY_VOICE_SETTING); | ||
300 | tasklet_enable(&hdev->tx_task); | ||
301 | } | ||
302 | } | ||
303 | |||
304 | static void hci_cc_write_voice_setting(struct hci_dev *hdev, struct sk_buff *skb) | ||
305 | { | ||
306 | __u8 status = *((__u8 *) skb->data); | ||
307 | void *sent; | ||
308 | |||
309 | BT_DBG("%s status 0x%x", hdev->name, status); | ||
310 | |||
311 | sent = hci_sent_cmd_data(hdev, HCI_OP_WRITE_VOICE_SETTING); | ||
312 | if (!sent) | ||
313 | return; | ||
314 | |||
315 | if (!status) { | ||
316 | __u16 setting = __le16_to_cpu(get_unaligned((__le16 *) sent)); | ||
317 | |||
318 | if (hdev->voice_setting != setting) { | ||
280 | hdev->voice_setting = setting; | 319 | hdev->voice_setting = setting; |
281 | 320 | ||
282 | BT_DBG("%s: voice setting 0x%04x", hdev->name, setting); | 321 | BT_DBG("%s voice setting 0x%04x", hdev->name, setting); |
283 | 322 | ||
284 | if (hdev->notify) { | 323 | if (hdev->notify) { |
285 | tasklet_disable(&hdev->tx_task); | 324 | tasklet_disable(&hdev->tx_task); |
@@ -287,143 +326,153 @@ static void hci_cc_host_ctl(struct hci_dev *hdev, __u16 ocf, struct sk_buff *skb | |||
287 | tasklet_enable(&hdev->tx_task); | 326 | tasklet_enable(&hdev->tx_task); |
288 | } | 327 | } |
289 | } | 328 | } |
290 | hci_req_complete(hdev, status); | ||
291 | break; | ||
292 | |||
293 | case OCF_HOST_BUFFER_SIZE: | ||
294 | status = *((__u8 *) skb->data); | ||
295 | if (status) { | ||
296 | BT_DBG("%s OCF_BUFFER_SIZE failed %d", hdev->name, status); | ||
297 | hci_req_complete(hdev, status); | ||
298 | } | ||
299 | break; | ||
300 | |||
301 | default: | ||
302 | BT_DBG("%s Command complete: ogf HOST_CTL ocf %x", hdev->name, ocf); | ||
303 | break; | ||
304 | } | 329 | } |
305 | } | 330 | } |
306 | 331 | ||
307 | /* Command Complete OGF INFO_PARAM */ | 332 | static void hci_cc_host_buffer_size(struct hci_dev *hdev, struct sk_buff *skb) |
308 | static void hci_cc_info_param(struct hci_dev *hdev, __u16 ocf, struct sk_buff *skb) | ||
309 | { | 333 | { |
310 | struct hci_rp_read_loc_version *lv; | 334 | __u8 status = *((__u8 *) skb->data); |
311 | struct hci_rp_read_local_features *lf; | ||
312 | struct hci_rp_read_buffer_size *bs; | ||
313 | struct hci_rp_read_bd_addr *ba; | ||
314 | 335 | ||
315 | BT_DBG("%s ocf 0x%x", hdev->name, ocf); | 336 | BT_DBG("%s status 0x%x", hdev->name, status); |
316 | 337 | ||
317 | switch (ocf) { | 338 | hci_req_complete(hdev, status); |
318 | case OCF_READ_LOCAL_VERSION: | 339 | } |
319 | lv = (struct hci_rp_read_loc_version *) skb->data; | ||
320 | 340 | ||
321 | if (lv->status) { | 341 | static void hci_cc_read_local_version(struct hci_dev *hdev, struct sk_buff *skb) |
322 | BT_DBG("%s READ_LOCAL_VERSION failed %d", hdev->name, lf->status); | 342 | { |
323 | break; | 343 | struct hci_rp_read_local_version *rp = (void *) skb->data; |
324 | } | ||
325 | 344 | ||
326 | hdev->hci_ver = lv->hci_ver; | 345 | BT_DBG("%s status 0x%x", hdev->name, rp->status); |
327 | hdev->hci_rev = btohs(lv->hci_rev); | ||
328 | hdev->manufacturer = btohs(lv->manufacturer); | ||
329 | 346 | ||
330 | BT_DBG("%s: manufacturer %d hci_ver %d hci_rev %d", hdev->name, | 347 | if (rp->status) |
331 | hdev->manufacturer, hdev->hci_ver, hdev->hci_rev); | 348 | return; |
332 | 349 | ||
333 | break; | 350 | hdev->hci_ver = rp->hci_ver; |
351 | hdev->hci_rev = btohs(rp->hci_rev); | ||
352 | hdev->manufacturer = btohs(rp->manufacturer); | ||
334 | 353 | ||
335 | case OCF_READ_LOCAL_FEATURES: | 354 | BT_DBG("%s manufacturer %d hci ver %d:%d", hdev->name, |
336 | lf = (struct hci_rp_read_local_features *) skb->data; | 355 | hdev->manufacturer, |
356 | hdev->hci_ver, hdev->hci_rev); | ||
357 | } | ||
337 | 358 | ||
338 | if (lf->status) { | 359 | static void hci_cc_read_local_commands(struct hci_dev *hdev, struct sk_buff *skb) |
339 | BT_DBG("%s READ_LOCAL_FEATURES failed %d", hdev->name, lf->status); | 360 | { |
340 | break; | 361 | struct hci_rp_read_local_commands *rp = (void *) skb->data; |
341 | } | ||
342 | 362 | ||
343 | memcpy(hdev->features, lf->features, sizeof(hdev->features)); | 363 | BT_DBG("%s status 0x%x", hdev->name, rp->status); |
344 | 364 | ||
345 | /* Adjust default settings according to features | 365 | if (rp->status) |
346 | * supported by device. */ | 366 | return; |
347 | if (hdev->features[0] & LMP_3SLOT) | ||
348 | hdev->pkt_type |= (HCI_DM3 | HCI_DH3); | ||
349 | 367 | ||
350 | if (hdev->features[0] & LMP_5SLOT) | 368 | memcpy(hdev->commands, rp->commands, sizeof(hdev->commands)); |
351 | hdev->pkt_type |= (HCI_DM5 | HCI_DH5); | 369 | } |
352 | 370 | ||
353 | if (hdev->features[1] & LMP_HV2) { | 371 | static void hci_cc_read_local_features(struct hci_dev *hdev, struct sk_buff *skb) |
354 | hdev->pkt_type |= (HCI_HV2); | 372 | { |
355 | hdev->esco_type |= (ESCO_HV2); | 373 | struct hci_rp_read_local_features *rp = (void *) skb->data; |
356 | } | ||
357 | 374 | ||
358 | if (hdev->features[1] & LMP_HV3) { | 375 | BT_DBG("%s status 0x%x", hdev->name, rp->status); |
359 | hdev->pkt_type |= (HCI_HV3); | ||
360 | hdev->esco_type |= (ESCO_HV3); | ||
361 | } | ||
362 | 376 | ||
363 | if (hdev->features[3] & LMP_ESCO) | 377 | if (rp->status) |
364 | hdev->esco_type |= (ESCO_EV3); | 378 | return; |
365 | 379 | ||
366 | if (hdev->features[4] & LMP_EV4) | 380 | memcpy(hdev->features, rp->features, 8); |
367 | hdev->esco_type |= (ESCO_EV4); | ||
368 | 381 | ||
369 | if (hdev->features[4] & LMP_EV5) | 382 | /* Adjust default settings according to features |
370 | hdev->esco_type |= (ESCO_EV5); | 383 | * supported by device. */ |
371 | 384 | ||
372 | BT_DBG("%s: features 0x%x 0x%x 0x%x", hdev->name, | 385 | if (hdev->features[0] & LMP_3SLOT) |
373 | lf->features[0], lf->features[1], lf->features[2]); | 386 | hdev->pkt_type |= (HCI_DM3 | HCI_DH3); |
374 | 387 | ||
375 | break; | 388 | if (hdev->features[0] & LMP_5SLOT) |
389 | hdev->pkt_type |= (HCI_DM5 | HCI_DH5); | ||
376 | 390 | ||
377 | case OCF_READ_BUFFER_SIZE: | 391 | if (hdev->features[1] & LMP_HV2) { |
378 | bs = (struct hci_rp_read_buffer_size *) skb->data; | 392 | hdev->pkt_type |= (HCI_HV2); |
393 | hdev->esco_type |= (ESCO_HV2); | ||
394 | } | ||
379 | 395 | ||
380 | if (bs->status) { | 396 | if (hdev->features[1] & LMP_HV3) { |
381 | BT_DBG("%s READ_BUFFER_SIZE failed %d", hdev->name, bs->status); | 397 | hdev->pkt_type |= (HCI_HV3); |
382 | hci_req_complete(hdev, bs->status); | 398 | hdev->esco_type |= (ESCO_HV3); |
383 | break; | 399 | } |
384 | } | ||
385 | 400 | ||
386 | hdev->acl_mtu = __le16_to_cpu(bs->acl_mtu); | 401 | if (hdev->features[3] & LMP_ESCO) |
387 | hdev->sco_mtu = bs->sco_mtu; | 402 | hdev->esco_type |= (ESCO_EV3); |
388 | hdev->acl_pkts = __le16_to_cpu(bs->acl_max_pkt); | ||
389 | hdev->sco_pkts = __le16_to_cpu(bs->sco_max_pkt); | ||
390 | 403 | ||
391 | if (test_bit(HCI_QUIRK_FIXUP_BUFFER_SIZE, &hdev->quirks)) { | 404 | if (hdev->features[4] & LMP_EV4) |
392 | hdev->sco_mtu = 64; | 405 | hdev->esco_type |= (ESCO_EV4); |
393 | hdev->sco_pkts = 8; | ||
394 | } | ||
395 | 406 | ||
396 | hdev->acl_cnt = hdev->acl_pkts; | 407 | if (hdev->features[4] & LMP_EV5) |
397 | hdev->sco_cnt = hdev->sco_pkts; | 408 | hdev->esco_type |= (ESCO_EV5); |
398 | 409 | ||
399 | BT_DBG("%s mtu: acl %d, sco %d max_pkt: acl %d, sco %d", hdev->name, | 410 | BT_DBG("%s features 0x%.2x%.2x%.2x%.2x%.2x%.2x%.2x%.2x", hdev->name, |
400 | hdev->acl_mtu, hdev->sco_mtu, hdev->acl_pkts, hdev->sco_pkts); | 411 | hdev->features[0], hdev->features[1], |
401 | break; | 412 | hdev->features[2], hdev->features[3], |
413 | hdev->features[4], hdev->features[5], | ||
414 | hdev->features[6], hdev->features[7]); | ||
415 | } | ||
402 | 416 | ||
403 | case OCF_READ_BD_ADDR: | 417 | static void hci_cc_read_buffer_size(struct hci_dev *hdev, struct sk_buff *skb) |
404 | ba = (struct hci_rp_read_bd_addr *) skb->data; | 418 | { |
419 | struct hci_rp_read_buffer_size *rp = (void *) skb->data; | ||
405 | 420 | ||
406 | if (!ba->status) { | 421 | BT_DBG("%s status 0x%x", hdev->name, rp->status); |
407 | bacpy(&hdev->bdaddr, &ba->bdaddr); | ||
408 | } else { | ||
409 | BT_DBG("%s: READ_BD_ADDR failed %d", hdev->name, ba->status); | ||
410 | } | ||
411 | 422 | ||
412 | hci_req_complete(hdev, ba->status); | 423 | if (rp->status) |
413 | break; | 424 | return; |
414 | 425 | ||
415 | default: | 426 | hdev->acl_mtu = __le16_to_cpu(rp->acl_mtu); |
416 | BT_DBG("%s Command complete: ogf INFO_PARAM ocf %x", hdev->name, ocf); | 427 | hdev->sco_mtu = rp->sco_mtu; |
417 | break; | 428 | hdev->acl_pkts = __le16_to_cpu(rp->acl_max_pkt); |
429 | hdev->sco_pkts = __le16_to_cpu(rp->sco_max_pkt); | ||
430 | |||
431 | if (test_bit(HCI_QUIRK_FIXUP_BUFFER_SIZE, &hdev->quirks)) { | ||
432 | hdev->sco_mtu = 64; | ||
433 | hdev->sco_pkts = 8; | ||
418 | } | 434 | } |
435 | |||
436 | hdev->acl_cnt = hdev->acl_pkts; | ||
437 | hdev->sco_cnt = hdev->sco_pkts; | ||
438 | |||
439 | BT_DBG("%s acl mtu %d:%d sco mtu %d:%d", hdev->name, | ||
440 | hdev->acl_mtu, hdev->acl_pkts, | ||
441 | hdev->sco_mtu, hdev->sco_pkts); | ||
442 | } | ||
443 | |||
444 | static void hci_cc_read_bd_addr(struct hci_dev *hdev, struct sk_buff *skb) | ||
445 | { | ||
446 | struct hci_rp_read_bd_addr *rp = (void *) skb->data; | ||
447 | |||
448 | BT_DBG("%s status 0x%x", hdev->name, rp->status); | ||
449 | |||
450 | if (!rp->status) | ||
451 | bacpy(&hdev->bdaddr, &rp->bdaddr); | ||
452 | |||
453 | hci_req_complete(hdev, rp->status); | ||
454 | } | ||
455 | |||
456 | static inline void hci_cs_inquiry(struct hci_dev *hdev, __u8 status) | ||
457 | { | ||
458 | BT_DBG("%s status 0x%x", hdev->name, status); | ||
459 | |||
460 | if (status) { | ||
461 | hci_req_complete(hdev, status); | ||
462 | |||
463 | hci_conn_check_pending(hdev); | ||
464 | } else | ||
465 | set_bit(HCI_INQUIRY, &hdev->flags); | ||
419 | } | 466 | } |
420 | 467 | ||
421 | /* Command Status OGF LINK_CTL */ | ||
422 | static inline void hci_cs_create_conn(struct hci_dev *hdev, __u8 status) | 468 | static inline void hci_cs_create_conn(struct hci_dev *hdev, __u8 status) |
423 | { | 469 | { |
470 | struct hci_cp_create_conn *cp; | ||
424 | struct hci_conn *conn; | 471 | struct hci_conn *conn; |
425 | struct hci_cp_create_conn *cp = hci_sent_cmd_data(hdev, OGF_LINK_CTL, OCF_CREATE_CONN); | ||
426 | 472 | ||
473 | BT_DBG("%s status 0x%x", hdev->name, status); | ||
474 | |||
475 | cp = hci_sent_cmd_data(hdev, HCI_OP_CREATE_CONN); | ||
427 | if (!cp) | 476 | if (!cp) |
428 | return; | 477 | return; |
429 | 478 | ||
@@ -431,8 +480,7 @@ static inline void hci_cs_create_conn(struct hci_dev *hdev, __u8 status) | |||
431 | 480 | ||
432 | conn = hci_conn_hash_lookup_ba(hdev, ACL_LINK, &cp->bdaddr); | 481 | conn = hci_conn_hash_lookup_ba(hdev, ACL_LINK, &cp->bdaddr); |
433 | 482 | ||
434 | BT_DBG("%s status 0x%x bdaddr %s conn %p", hdev->name, | 483 | BT_DBG("%s bdaddr %s conn %p", hdev->name, batostr(&cp->bdaddr), conn); |
435 | status, batostr(&cp->bdaddr), conn); | ||
436 | 484 | ||
437 | if (status) { | 485 | if (status) { |
438 | if (conn && conn->state == BT_CONNECT) { | 486 | if (conn && conn->state == BT_CONNECT) { |
@@ -457,234 +505,138 @@ static inline void hci_cs_create_conn(struct hci_dev *hdev, __u8 status) | |||
457 | hci_dev_unlock(hdev); | 505 | hci_dev_unlock(hdev); |
458 | } | 506 | } |
459 | 507 | ||
460 | static void hci_cs_link_ctl(struct hci_dev *hdev, __u16 ocf, __u8 status) | 508 | static void hci_cs_add_sco(struct hci_dev *hdev, __u8 status) |
461 | { | 509 | { |
462 | BT_DBG("%s ocf 0x%x", hdev->name, ocf); | 510 | struct hci_cp_add_sco *cp; |
511 | struct hci_conn *acl, *sco; | ||
512 | __u16 handle; | ||
463 | 513 | ||
464 | switch (ocf) { | 514 | BT_DBG("%s status 0x%x", hdev->name, status); |
465 | case OCF_CREATE_CONN: | ||
466 | hci_cs_create_conn(hdev, status); | ||
467 | break; | ||
468 | |||
469 | case OCF_ADD_SCO: | ||
470 | if (status) { | ||
471 | struct hci_conn *acl, *sco; | ||
472 | struct hci_cp_add_sco *cp = hci_sent_cmd_data(hdev, OGF_LINK_CTL, OCF_ADD_SCO); | ||
473 | __u16 handle; | ||
474 | |||
475 | if (!cp) | ||
476 | break; | ||
477 | 515 | ||
478 | handle = __le16_to_cpu(cp->handle); | 516 | if (!status) |
479 | 517 | return; | |
480 | BT_DBG("%s Add SCO error: handle %d status 0x%x", hdev->name, handle, status); | ||
481 | 518 | ||
482 | hci_dev_lock(hdev); | 519 | cp = hci_sent_cmd_data(hdev, HCI_OP_ADD_SCO); |
520 | if (!cp) | ||
521 | return; | ||
483 | 522 | ||
484 | acl = hci_conn_hash_lookup_handle(hdev, handle); | 523 | handle = __le16_to_cpu(cp->handle); |
485 | if (acl && (sco = acl->link)) { | ||
486 | sco->state = BT_CLOSED; | ||
487 | 524 | ||
488 | hci_proto_connect_cfm(sco, status); | 525 | BT_DBG("%s handle %d", hdev->name, handle); |
489 | hci_conn_del(sco); | ||
490 | } | ||
491 | 526 | ||
492 | hci_dev_unlock(hdev); | 527 | hci_dev_lock(hdev); |
493 | } | ||
494 | break; | ||
495 | 528 | ||
496 | case OCF_INQUIRY: | 529 | acl = hci_conn_hash_lookup_handle(hdev, handle); |
497 | if (status) { | 530 | if (acl && (sco = acl->link)) { |
498 | BT_DBG("%s Inquiry error: status 0x%x", hdev->name, status); | 531 | sco->state = BT_CLOSED; |
499 | hci_req_complete(hdev, status); | ||
500 | } else { | ||
501 | set_bit(HCI_INQUIRY, &hdev->flags); | ||
502 | } | ||
503 | break; | ||
504 | 532 | ||
505 | default: | 533 | hci_proto_connect_cfm(sco, status); |
506 | BT_DBG("%s Command status: ogf LINK_CTL ocf %x status %d", | 534 | hci_conn_del(sco); |
507 | hdev->name, ocf, status); | ||
508 | break; | ||
509 | } | 535 | } |
536 | |||
537 | hci_dev_unlock(hdev); | ||
510 | } | 538 | } |
511 | 539 | ||
512 | /* Command Status OGF LINK_POLICY */ | 540 | static void hci_cs_remote_name_req(struct hci_dev *hdev, __u8 status) |
513 | static void hci_cs_link_policy(struct hci_dev *hdev, __u16 ocf, __u8 status) | ||
514 | { | 541 | { |
515 | BT_DBG("%s ocf 0x%x", hdev->name, ocf); | 542 | BT_DBG("%s status 0x%x", hdev->name, status); |
516 | 543 | } | |
517 | switch (ocf) { | ||
518 | case OCF_SNIFF_MODE: | ||
519 | if (status) { | ||
520 | struct hci_conn *conn; | ||
521 | struct hci_cp_sniff_mode *cp = hci_sent_cmd_data(hdev, OGF_LINK_POLICY, OCF_SNIFF_MODE); | ||
522 | 544 | ||
523 | if (!cp) | 545 | static void hci_cs_setup_sync_conn(struct hci_dev *hdev, __u8 status) |
524 | break; | 546 | { |
547 | struct hci_cp_setup_sync_conn *cp; | ||
548 | struct hci_conn *acl, *sco; | ||
549 | __u16 handle; | ||
525 | 550 | ||
526 | hci_dev_lock(hdev); | 551 | BT_DBG("%s status 0x%x", hdev->name, status); |
527 | 552 | ||
528 | conn = hci_conn_hash_lookup_handle(hdev, __le16_to_cpu(cp->handle)); | 553 | if (!status) |
529 | if (conn) { | 554 | return; |
530 | clear_bit(HCI_CONN_MODE_CHANGE_PEND, &conn->pend); | ||
531 | } | ||
532 | |||
533 | hci_dev_unlock(hdev); | ||
534 | } | ||
535 | break; | ||
536 | 555 | ||
537 | case OCF_EXIT_SNIFF_MODE: | 556 | cp = hci_sent_cmd_data(hdev, HCI_OP_SETUP_SYNC_CONN); |
538 | if (status) { | 557 | if (!cp) |
539 | struct hci_conn *conn; | 558 | return; |
540 | struct hci_cp_exit_sniff_mode *cp = hci_sent_cmd_data(hdev, OGF_LINK_POLICY, OCF_EXIT_SNIFF_MODE); | ||
541 | 559 | ||
542 | if (!cp) | 560 | handle = __le16_to_cpu(cp->handle); |
543 | break; | ||
544 | 561 | ||
545 | hci_dev_lock(hdev); | 562 | BT_DBG("%s handle %d", hdev->name, handle); |
546 | 563 | ||
547 | conn = hci_conn_hash_lookup_handle(hdev, __le16_to_cpu(cp->handle)); | 564 | hci_dev_lock(hdev); |
548 | if (conn) { | ||
549 | clear_bit(HCI_CONN_MODE_CHANGE_PEND, &conn->pend); | ||
550 | } | ||
551 | 565 | ||
552 | hci_dev_unlock(hdev); | 566 | acl = hci_conn_hash_lookup_handle(hdev, handle); |
553 | } | 567 | if (acl && (sco = acl->link)) { |
554 | break; | 568 | sco->state = BT_CLOSED; |
555 | 569 | ||
556 | default: | 570 | hci_proto_connect_cfm(sco, status); |
557 | BT_DBG("%s Command status: ogf LINK_POLICY ocf %x", hdev->name, ocf); | 571 | hci_conn_del(sco); |
558 | break; | ||
559 | } | 572 | } |
560 | } | ||
561 | 573 | ||
562 | /* Command Status OGF HOST_CTL */ | 574 | hci_dev_unlock(hdev); |
563 | static void hci_cs_host_ctl(struct hci_dev *hdev, __u16 ocf, __u8 status) | ||
564 | { | ||
565 | BT_DBG("%s ocf 0x%x", hdev->name, ocf); | ||
566 | |||
567 | switch (ocf) { | ||
568 | default: | ||
569 | BT_DBG("%s Command status: ogf HOST_CTL ocf %x", hdev->name, ocf); | ||
570 | break; | ||
571 | } | ||
572 | } | 575 | } |
573 | 576 | ||
574 | /* Command Status OGF INFO_PARAM */ | 577 | static void hci_cs_sniff_mode(struct hci_dev *hdev, __u8 status) |
575 | static void hci_cs_info_param(struct hci_dev *hdev, __u16 ocf, __u8 status) | ||
576 | { | 578 | { |
577 | BT_DBG("%s: hci_cs_info_param: ocf 0x%x", hdev->name, ocf); | 579 | struct hci_cp_sniff_mode *cp; |
578 | 580 | struct hci_conn *conn; | |
579 | switch (ocf) { | ||
580 | default: | ||
581 | BT_DBG("%s Command status: ogf INFO_PARAM ocf %x", hdev->name, ocf); | ||
582 | break; | ||
583 | } | ||
584 | } | ||
585 | 581 | ||
586 | /* Inquiry Complete */ | 582 | BT_DBG("%s status 0x%x", hdev->name, status); |
587 | static inline void hci_inquiry_complete_evt(struct hci_dev *hdev, struct sk_buff *skb) | ||
588 | { | ||
589 | __u8 status = *((__u8 *) skb->data); | ||
590 | struct hci_conn *pend; | ||
591 | 583 | ||
592 | BT_DBG("%s status %d", hdev->name, status); | 584 | if (!status) |
585 | return; | ||
593 | 586 | ||
594 | clear_bit(HCI_INQUIRY, &hdev->flags); | 587 | cp = hci_sent_cmd_data(hdev, HCI_OP_SNIFF_MODE); |
595 | hci_req_complete(hdev, status); | 588 | if (!cp) |
589 | return; | ||
596 | 590 | ||
597 | hci_dev_lock(hdev); | 591 | hci_dev_lock(hdev); |
598 | 592 | ||
599 | pend = hci_conn_hash_lookup_state(hdev, ACL_LINK, BT_CONNECT2); | 593 | conn = hci_conn_hash_lookup_handle(hdev, __le16_to_cpu(cp->handle)); |
600 | if (pend) | 594 | if (conn) |
601 | hci_acl_connect(pend); | 595 | clear_bit(HCI_CONN_MODE_CHANGE_PEND, &conn->pend); |
602 | 596 | ||
603 | hci_dev_unlock(hdev); | 597 | hci_dev_unlock(hdev); |
604 | } | 598 | } |
605 | 599 | ||
606 | /* Inquiry Result */ | 600 | static void hci_cs_exit_sniff_mode(struct hci_dev *hdev, __u8 status) |
607 | static inline void hci_inquiry_result_evt(struct hci_dev *hdev, struct sk_buff *skb) | ||
608 | { | 601 | { |
609 | struct inquiry_data data; | 602 | struct hci_cp_exit_sniff_mode *cp; |
610 | struct inquiry_info *info = (struct inquiry_info *) (skb->data + 1); | 603 | struct hci_conn *conn; |
611 | int num_rsp = *((__u8 *) skb->data); | ||
612 | 604 | ||
613 | BT_DBG("%s num_rsp %d", hdev->name, num_rsp); | 605 | BT_DBG("%s status 0x%x", hdev->name, status); |
614 | 606 | ||
615 | if (!num_rsp) | 607 | if (!status) |
608 | return; | ||
609 | |||
610 | cp = hci_sent_cmd_data(hdev, HCI_OP_EXIT_SNIFF_MODE); | ||
611 | if (!cp) | ||
616 | return; | 612 | return; |
617 | 613 | ||
618 | hci_dev_lock(hdev); | 614 | hci_dev_lock(hdev); |
619 | 615 | ||
620 | for (; num_rsp; num_rsp--) { | 616 | conn = hci_conn_hash_lookup_handle(hdev, __le16_to_cpu(cp->handle)); |
621 | bacpy(&data.bdaddr, &info->bdaddr); | 617 | if (conn) |
622 | data.pscan_rep_mode = info->pscan_rep_mode; | 618 | clear_bit(HCI_CONN_MODE_CHANGE_PEND, &conn->pend); |
623 | data.pscan_period_mode = info->pscan_period_mode; | ||
624 | data.pscan_mode = info->pscan_mode; | ||
625 | memcpy(data.dev_class, info->dev_class, 3); | ||
626 | data.clock_offset = info->clock_offset; | ||
627 | data.rssi = 0x00; | ||
628 | info++; | ||
629 | hci_inquiry_cache_update(hdev, &data); | ||
630 | } | ||
631 | 619 | ||
632 | hci_dev_unlock(hdev); | 620 | hci_dev_unlock(hdev); |
633 | } | 621 | } |
634 | 622 | ||
635 | /* Inquiry Result With RSSI */ | 623 | static inline void hci_inquiry_complete_evt(struct hci_dev *hdev, struct sk_buff *skb) |
636 | static inline void hci_inquiry_result_with_rssi_evt(struct hci_dev *hdev, struct sk_buff *skb) | ||
637 | { | 624 | { |
638 | struct inquiry_data data; | 625 | __u8 status = *((__u8 *) skb->data); |
639 | int num_rsp = *((__u8 *) skb->data); | ||
640 | |||
641 | BT_DBG("%s num_rsp %d", hdev->name, num_rsp); | ||
642 | |||
643 | if (!num_rsp) | ||
644 | return; | ||
645 | |||
646 | hci_dev_lock(hdev); | ||
647 | 626 | ||
648 | if ((skb->len - 1) / num_rsp != sizeof(struct inquiry_info_with_rssi)) { | 627 | BT_DBG("%s status %d", hdev->name, status); |
649 | struct inquiry_info_with_rssi_and_pscan_mode *info = | ||
650 | (struct inquiry_info_with_rssi_and_pscan_mode *) (skb->data + 1); | ||
651 | 628 | ||
652 | for (; num_rsp; num_rsp--) { | 629 | clear_bit(HCI_INQUIRY, &hdev->flags); |
653 | bacpy(&data.bdaddr, &info->bdaddr); | ||
654 | data.pscan_rep_mode = info->pscan_rep_mode; | ||
655 | data.pscan_period_mode = info->pscan_period_mode; | ||
656 | data.pscan_mode = info->pscan_mode; | ||
657 | memcpy(data.dev_class, info->dev_class, 3); | ||
658 | data.clock_offset = info->clock_offset; | ||
659 | data.rssi = info->rssi; | ||
660 | info++; | ||
661 | hci_inquiry_cache_update(hdev, &data); | ||
662 | } | ||
663 | } else { | ||
664 | struct inquiry_info_with_rssi *info = | ||
665 | (struct inquiry_info_with_rssi *) (skb->data + 1); | ||
666 | 630 | ||
667 | for (; num_rsp; num_rsp--) { | 631 | hci_req_complete(hdev, status); |
668 | bacpy(&data.bdaddr, &info->bdaddr); | ||
669 | data.pscan_rep_mode = info->pscan_rep_mode; | ||
670 | data.pscan_period_mode = info->pscan_period_mode; | ||
671 | data.pscan_mode = 0x00; | ||
672 | memcpy(data.dev_class, info->dev_class, 3); | ||
673 | data.clock_offset = info->clock_offset; | ||
674 | data.rssi = info->rssi; | ||
675 | info++; | ||
676 | hci_inquiry_cache_update(hdev, &data); | ||
677 | } | ||
678 | } | ||
679 | 632 | ||
680 | hci_dev_unlock(hdev); | 633 | hci_conn_check_pending(hdev); |
681 | } | 634 | } |
682 | 635 | ||
683 | /* Extended Inquiry Result */ | 636 | static inline void hci_inquiry_result_evt(struct hci_dev *hdev, struct sk_buff *skb) |
684 | static inline void hci_extended_inquiry_result_evt(struct hci_dev *hdev, struct sk_buff *skb) | ||
685 | { | 637 | { |
686 | struct inquiry_data data; | 638 | struct inquiry_data data; |
687 | struct extended_inquiry_info *info = (struct extended_inquiry_info *) (skb->data + 1); | 639 | struct inquiry_info *info = (void *) (skb->data + 1); |
688 | int num_rsp = *((__u8 *) skb->data); | 640 | int num_rsp = *((__u8 *) skb->data); |
689 | 641 | ||
690 | BT_DBG("%s num_rsp %d", hdev->name, num_rsp); | 642 | BT_DBG("%s num_rsp %d", hdev->name, num_rsp); |
@@ -696,12 +648,12 @@ static inline void hci_extended_inquiry_result_evt(struct hci_dev *hdev, struct | |||
696 | 648 | ||
697 | for (; num_rsp; num_rsp--) { | 649 | for (; num_rsp; num_rsp--) { |
698 | bacpy(&data.bdaddr, &info->bdaddr); | 650 | bacpy(&data.bdaddr, &info->bdaddr); |
699 | data.pscan_rep_mode = info->pscan_rep_mode; | 651 | data.pscan_rep_mode = info->pscan_rep_mode; |
700 | data.pscan_period_mode = info->pscan_period_mode; | 652 | data.pscan_period_mode = info->pscan_period_mode; |
701 | data.pscan_mode = 0x00; | 653 | data.pscan_mode = info->pscan_mode; |
702 | memcpy(data.dev_class, info->dev_class, 3); | 654 | memcpy(data.dev_class, info->dev_class, 3); |
703 | data.clock_offset = info->clock_offset; | 655 | data.clock_offset = info->clock_offset; |
704 | data.rssi = info->rssi; | 656 | data.rssi = 0x00; |
705 | info++; | 657 | info++; |
706 | hci_inquiry_cache_update(hdev, &data); | 658 | hci_inquiry_cache_update(hdev, &data); |
707 | } | 659 | } |
@@ -709,70 +661,18 @@ static inline void hci_extended_inquiry_result_evt(struct hci_dev *hdev, struct | |||
709 | hci_dev_unlock(hdev); | 661 | hci_dev_unlock(hdev); |
710 | } | 662 | } |
711 | 663 | ||
712 | /* Connect Request */ | ||
713 | static inline void hci_conn_request_evt(struct hci_dev *hdev, struct sk_buff *skb) | ||
714 | { | ||
715 | struct hci_ev_conn_request *ev = (struct hci_ev_conn_request *) skb->data; | ||
716 | int mask = hdev->link_mode; | ||
717 | |||
718 | BT_DBG("%s Connection request: %s type 0x%x", hdev->name, | ||
719 | batostr(&ev->bdaddr), ev->link_type); | ||
720 | |||
721 | mask |= hci_proto_connect_ind(hdev, &ev->bdaddr, ev->link_type); | ||
722 | |||
723 | if (mask & HCI_LM_ACCEPT) { | ||
724 | /* Connection accepted */ | ||
725 | struct hci_conn *conn; | ||
726 | struct hci_cp_accept_conn_req cp; | ||
727 | |||
728 | hci_dev_lock(hdev); | ||
729 | conn = hci_conn_hash_lookup_ba(hdev, ev->link_type, &ev->bdaddr); | ||
730 | if (!conn) { | ||
731 | if (!(conn = hci_conn_add(hdev, ev->link_type, &ev->bdaddr))) { | ||
732 | BT_ERR("No memmory for new connection"); | ||
733 | hci_dev_unlock(hdev); | ||
734 | return; | ||
735 | } | ||
736 | } | ||
737 | memcpy(conn->dev_class, ev->dev_class, 3); | ||
738 | conn->state = BT_CONNECT; | ||
739 | hci_dev_unlock(hdev); | ||
740 | |||
741 | bacpy(&cp.bdaddr, &ev->bdaddr); | ||
742 | |||
743 | if (lmp_rswitch_capable(hdev) && (mask & HCI_LM_MASTER)) | ||
744 | cp.role = 0x00; /* Become master */ | ||
745 | else | ||
746 | cp.role = 0x01; /* Remain slave */ | ||
747 | |||
748 | hci_send_cmd(hdev, OGF_LINK_CTL, | ||
749 | OCF_ACCEPT_CONN_REQ, sizeof(cp), &cp); | ||
750 | } else { | ||
751 | /* Connection rejected */ | ||
752 | struct hci_cp_reject_conn_req cp; | ||
753 | |||
754 | bacpy(&cp.bdaddr, &ev->bdaddr); | ||
755 | cp.reason = 0x0f; | ||
756 | hci_send_cmd(hdev, OGF_LINK_CTL, | ||
757 | OCF_REJECT_CONN_REQ, sizeof(cp), &cp); | ||
758 | } | ||
759 | } | ||
760 | |||
761 | /* Connect Complete */ | ||
762 | static inline void hci_conn_complete_evt(struct hci_dev *hdev, struct sk_buff *skb) | 664 | static inline void hci_conn_complete_evt(struct hci_dev *hdev, struct sk_buff *skb) |
763 | { | 665 | { |
764 | struct hci_ev_conn_complete *ev = (struct hci_ev_conn_complete *) skb->data; | 666 | struct hci_ev_conn_complete *ev = (void *) skb->data; |
765 | struct hci_conn *conn, *pend; | 667 | struct hci_conn *conn; |
766 | 668 | ||
767 | BT_DBG("%s", hdev->name); | 669 | BT_DBG("%s", hdev->name); |
768 | 670 | ||
769 | hci_dev_lock(hdev); | 671 | hci_dev_lock(hdev); |
770 | 672 | ||
771 | conn = hci_conn_hash_lookup_ba(hdev, ev->link_type, &ev->bdaddr); | 673 | conn = hci_conn_hash_lookup_ba(hdev, ev->link_type, &ev->bdaddr); |
772 | if (!conn) { | 674 | if (!conn) |
773 | hci_dev_unlock(hdev); | 675 | goto unlock; |
774 | return; | ||
775 | } | ||
776 | 676 | ||
777 | if (!ev->status) { | 677 | if (!ev->status) { |
778 | conn->handle = __le16_to_cpu(ev->handle); | 678 | conn->handle = __le16_to_cpu(ev->handle); |
@@ -788,8 +688,7 @@ static inline void hci_conn_complete_evt(struct hci_dev *hdev, struct sk_buff *s | |||
788 | if (conn->type == ACL_LINK) { | 688 | if (conn->type == ACL_LINK) { |
789 | struct hci_cp_read_remote_features cp; | 689 | struct hci_cp_read_remote_features cp; |
790 | cp.handle = ev->handle; | 690 | cp.handle = ev->handle; |
791 | hci_send_cmd(hdev, OGF_LINK_CTL, | 691 | hci_send_cmd(hdev, HCI_OP_READ_REMOTE_FEATURES, sizeof(cp), &cp); |
792 | OCF_READ_REMOTE_FEATURES, sizeof(cp), &cp); | ||
793 | } | 692 | } |
794 | 693 | ||
795 | /* Set link policy */ | 694 | /* Set link policy */ |
@@ -797,8 +696,7 @@ static inline void hci_conn_complete_evt(struct hci_dev *hdev, struct sk_buff *s | |||
797 | struct hci_cp_write_link_policy cp; | 696 | struct hci_cp_write_link_policy cp; |
798 | cp.handle = ev->handle; | 697 | cp.handle = ev->handle; |
799 | cp.policy = cpu_to_le16(hdev->link_policy); | 698 | cp.policy = cpu_to_le16(hdev->link_policy); |
800 | hci_send_cmd(hdev, OGF_LINK_POLICY, | 699 | hci_send_cmd(hdev, HCI_OP_WRITE_LINK_POLICY, sizeof(cp), &cp); |
801 | OCF_WRITE_LINK_POLICY, sizeof(cp), &cp); | ||
802 | } | 700 | } |
803 | 701 | ||
804 | /* Set packet type for incoming connection */ | 702 | /* Set packet type for incoming connection */ |
@@ -809,8 +707,7 @@ static inline void hci_conn_complete_evt(struct hci_dev *hdev, struct sk_buff *s | |||
809 | cpu_to_le16(hdev->pkt_type & ACL_PTYPE_MASK): | 707 | cpu_to_le16(hdev->pkt_type & ACL_PTYPE_MASK): |
810 | cpu_to_le16(hdev->pkt_type & SCO_PTYPE_MASK); | 708 | cpu_to_le16(hdev->pkt_type & SCO_PTYPE_MASK); |
811 | 709 | ||
812 | hci_send_cmd(hdev, OGF_LINK_CTL, | 710 | hci_send_cmd(hdev, HCI_OP_CHANGE_CONN_PTYPE, sizeof(cp), &cp); |
813 | OCF_CHANGE_CONN_PTYPE, sizeof(cp), &cp); | ||
814 | } else { | 711 | } else { |
815 | /* Update disconnect timer */ | 712 | /* Update disconnect timer */ |
816 | hci_conn_hold(conn); | 713 | hci_conn_hold(conn); |
@@ -822,9 +719,12 @@ static inline void hci_conn_complete_evt(struct hci_dev *hdev, struct sk_buff *s | |||
822 | if (conn->type == ACL_LINK) { | 719 | if (conn->type == ACL_LINK) { |
823 | struct hci_conn *sco = conn->link; | 720 | struct hci_conn *sco = conn->link; |
824 | if (sco) { | 721 | if (sco) { |
825 | if (!ev->status) | 722 | if (!ev->status) { |
826 | hci_add_sco(sco, conn->handle); | 723 | if (lmp_esco_capable(hdev)) |
827 | else { | 724 | hci_setup_sync(sco, conn->handle); |
725 | else | ||
726 | hci_add_sco(sco, conn->handle); | ||
727 | } else { | ||
828 | hci_proto_connect_cfm(sco, ev->status); | 728 | hci_proto_connect_cfm(sco, ev->status); |
829 | hci_conn_del(sco); | 729 | hci_conn_del(sco); |
830 | } | 730 | } |
@@ -835,136 +735,104 @@ static inline void hci_conn_complete_evt(struct hci_dev *hdev, struct sk_buff *s | |||
835 | if (ev->status) | 735 | if (ev->status) |
836 | hci_conn_del(conn); | 736 | hci_conn_del(conn); |
837 | 737 | ||
838 | pend = hci_conn_hash_lookup_state(hdev, ACL_LINK, BT_CONNECT2); | 738 | unlock: |
839 | if (pend) | ||
840 | hci_acl_connect(pend); | ||
841 | |||
842 | hci_dev_unlock(hdev); | 739 | hci_dev_unlock(hdev); |
843 | } | ||
844 | |||
845 | /* Disconnect Complete */ | ||
846 | static inline void hci_disconn_complete_evt(struct hci_dev *hdev, struct sk_buff *skb) | ||
847 | { | ||
848 | struct hci_ev_disconn_complete *ev = (struct hci_ev_disconn_complete *) skb->data; | ||
849 | struct hci_conn *conn; | ||
850 | |||
851 | BT_DBG("%s status %d", hdev->name, ev->status); | ||
852 | |||
853 | if (ev->status) | ||
854 | return; | ||
855 | 740 | ||
856 | hci_dev_lock(hdev); | 741 | hci_conn_check_pending(hdev); |
857 | |||
858 | conn = hci_conn_hash_lookup_handle(hdev, __le16_to_cpu(ev->handle)); | ||
859 | if (conn) { | ||
860 | conn->state = BT_CLOSED; | ||
861 | hci_proto_disconn_ind(conn, ev->reason); | ||
862 | hci_conn_del(conn); | ||
863 | } | ||
864 | |||
865 | hci_dev_unlock(hdev); | ||
866 | } | 742 | } |
867 | 743 | ||
868 | /* Number of completed packets */ | 744 | static inline void hci_conn_request_evt(struct hci_dev *hdev, struct sk_buff *skb) |
869 | static inline void hci_num_comp_pkts_evt(struct hci_dev *hdev, struct sk_buff *skb) | ||
870 | { | 745 | { |
871 | struct hci_ev_num_comp_pkts *ev = (struct hci_ev_num_comp_pkts *) skb->data; | 746 | struct hci_ev_conn_request *ev = (void *) skb->data; |
872 | __le16 *ptr; | 747 | int mask = hdev->link_mode; |
873 | int i; | ||
874 | |||
875 | skb_pull(skb, sizeof(*ev)); | ||
876 | |||
877 | BT_DBG("%s num_hndl %d", hdev->name, ev->num_hndl); | ||
878 | 748 | ||
879 | if (skb->len < ev->num_hndl * 4) { | 749 | BT_DBG("%s bdaddr %s type 0x%x", hdev->name, |
880 | BT_DBG("%s bad parameters", hdev->name); | 750 | batostr(&ev->bdaddr), ev->link_type); |
881 | return; | ||
882 | } | ||
883 | 751 | ||
884 | tasklet_disable(&hdev->tx_task); | 752 | mask |= hci_proto_connect_ind(hdev, &ev->bdaddr, ev->link_type); |
885 | 753 | ||
886 | for (i = 0, ptr = (__le16 *) skb->data; i < ev->num_hndl; i++) { | 754 | if (mask & HCI_LM_ACCEPT) { |
755 | /* Connection accepted */ | ||
887 | struct hci_conn *conn; | 756 | struct hci_conn *conn; |
888 | __u16 handle, count; | ||
889 | |||
890 | handle = __le16_to_cpu(get_unaligned(ptr++)); | ||
891 | count = __le16_to_cpu(get_unaligned(ptr++)); | ||
892 | 757 | ||
893 | conn = hci_conn_hash_lookup_handle(hdev, handle); | 758 | hci_dev_lock(hdev); |
894 | if (conn) { | ||
895 | conn->sent -= count; | ||
896 | 759 | ||
897 | if (conn->type == ACL_LINK) { | 760 | conn = hci_conn_hash_lookup_ba(hdev, ev->link_type, &ev->bdaddr); |
898 | if ((hdev->acl_cnt += count) > hdev->acl_pkts) | 761 | if (!conn) { |
899 | hdev->acl_cnt = hdev->acl_pkts; | 762 | if (!(conn = hci_conn_add(hdev, ev->link_type, &ev->bdaddr))) { |
900 | } else { | 763 | BT_ERR("No memmory for new connection"); |
901 | if ((hdev->sco_cnt += count) > hdev->sco_pkts) | 764 | hci_dev_unlock(hdev); |
902 | hdev->sco_cnt = hdev->sco_pkts; | 765 | return; |
903 | } | 766 | } |
904 | } | 767 | } |
905 | } | ||
906 | hci_sched_tx(hdev); | ||
907 | 768 | ||
908 | tasklet_enable(&hdev->tx_task); | 769 | memcpy(conn->dev_class, ev->dev_class, 3); |
909 | } | 770 | conn->state = BT_CONNECT; |
910 | 771 | ||
911 | /* Role Change */ | 772 | hci_dev_unlock(hdev); |
912 | static inline void hci_role_change_evt(struct hci_dev *hdev, struct sk_buff *skb) | ||
913 | { | ||
914 | struct hci_ev_role_change *ev = (struct hci_ev_role_change *) skb->data; | ||
915 | struct hci_conn *conn; | ||
916 | 773 | ||
917 | BT_DBG("%s status %d", hdev->name, ev->status); | 774 | if (ev->link_type == ACL_LINK || !lmp_esco_capable(hdev)) { |
775 | struct hci_cp_accept_conn_req cp; | ||
918 | 776 | ||
919 | hci_dev_lock(hdev); | 777 | bacpy(&cp.bdaddr, &ev->bdaddr); |
920 | 778 | ||
921 | conn = hci_conn_hash_lookup_ba(hdev, ACL_LINK, &ev->bdaddr); | 779 | if (lmp_rswitch_capable(hdev) && (mask & HCI_LM_MASTER)) |
922 | if (conn) { | 780 | cp.role = 0x00; /* Become master */ |
923 | if (!ev->status) { | ||
924 | if (ev->role) | ||
925 | conn->link_mode &= ~HCI_LM_MASTER; | ||
926 | else | 781 | else |
927 | conn->link_mode |= HCI_LM_MASTER; | 782 | cp.role = 0x01; /* Remain slave */ |
928 | } | ||
929 | 783 | ||
930 | clear_bit(HCI_CONN_RSWITCH_PEND, &conn->pend); | 784 | hci_send_cmd(hdev, HCI_OP_ACCEPT_CONN_REQ, |
785 | sizeof(cp), &cp); | ||
786 | } else { | ||
787 | struct hci_cp_accept_sync_conn_req cp; | ||
931 | 788 | ||
932 | hci_role_switch_cfm(conn, ev->status, ev->role); | 789 | bacpy(&cp.bdaddr, &ev->bdaddr); |
933 | } | 790 | cp.pkt_type = cpu_to_le16(hdev->esco_type); |
934 | 791 | ||
935 | hci_dev_unlock(hdev); | 792 | cp.tx_bandwidth = cpu_to_le32(0x00001f40); |
793 | cp.rx_bandwidth = cpu_to_le32(0x00001f40); | ||
794 | cp.max_latency = cpu_to_le16(0xffff); | ||
795 | cp.content_format = cpu_to_le16(hdev->voice_setting); | ||
796 | cp.retrans_effort = 0xff; | ||
797 | |||
798 | hci_send_cmd(hdev, HCI_OP_ACCEPT_SYNC_CONN_REQ, | ||
799 | sizeof(cp), &cp); | ||
800 | } | ||
801 | } else { | ||
802 | /* Connection rejected */ | ||
803 | struct hci_cp_reject_conn_req cp; | ||
804 | |||
805 | bacpy(&cp.bdaddr, &ev->bdaddr); | ||
806 | cp.reason = 0x0f; | ||
807 | hci_send_cmd(hdev, HCI_OP_REJECT_CONN_REQ, sizeof(cp), &cp); | ||
808 | } | ||
936 | } | 809 | } |
937 | 810 | ||
938 | /* Mode Change */ | 811 | static inline void hci_disconn_complete_evt(struct hci_dev *hdev, struct sk_buff *skb) |
939 | static inline void hci_mode_change_evt(struct hci_dev *hdev, struct sk_buff *skb) | ||
940 | { | 812 | { |
941 | struct hci_ev_mode_change *ev = (struct hci_ev_mode_change *) skb->data; | 813 | struct hci_ev_disconn_complete *ev = (void *) skb->data; |
942 | struct hci_conn *conn; | 814 | struct hci_conn *conn; |
943 | 815 | ||
944 | BT_DBG("%s status %d", hdev->name, ev->status); | 816 | BT_DBG("%s status %d", hdev->name, ev->status); |
945 | 817 | ||
818 | if (ev->status) | ||
819 | return; | ||
820 | |||
946 | hci_dev_lock(hdev); | 821 | hci_dev_lock(hdev); |
947 | 822 | ||
948 | conn = hci_conn_hash_lookup_handle(hdev, __le16_to_cpu(ev->handle)); | 823 | conn = hci_conn_hash_lookup_handle(hdev, __le16_to_cpu(ev->handle)); |
949 | if (conn) { | 824 | if (conn) { |
950 | conn->mode = ev->mode; | 825 | conn->state = BT_CLOSED; |
951 | conn->interval = __le16_to_cpu(ev->interval); | 826 | hci_proto_disconn_ind(conn, ev->reason); |
952 | 827 | hci_conn_del(conn); | |
953 | if (!test_and_clear_bit(HCI_CONN_MODE_CHANGE_PEND, &conn->pend)) { | ||
954 | if (conn->mode == HCI_CM_ACTIVE) | ||
955 | conn->power_save = 1; | ||
956 | else | ||
957 | conn->power_save = 0; | ||
958 | } | ||
959 | } | 828 | } |
960 | 829 | ||
961 | hci_dev_unlock(hdev); | 830 | hci_dev_unlock(hdev); |
962 | } | 831 | } |
963 | 832 | ||
964 | /* Authentication Complete */ | ||
965 | static inline void hci_auth_complete_evt(struct hci_dev *hdev, struct sk_buff *skb) | 833 | static inline void hci_auth_complete_evt(struct hci_dev *hdev, struct sk_buff *skb) |
966 | { | 834 | { |
967 | struct hci_ev_auth_complete *ev = (struct hci_ev_auth_complete *) skb->data; | 835 | struct hci_ev_auth_complete *ev = (void *) skb->data; |
968 | struct hci_conn *conn; | 836 | struct hci_conn *conn; |
969 | 837 | ||
970 | BT_DBG("%s status %d", hdev->name, ev->status); | 838 | BT_DBG("%s status %d", hdev->name, ev->status); |
@@ -985,8 +853,8 @@ static inline void hci_auth_complete_evt(struct hci_dev *hdev, struct sk_buff *s | |||
985 | struct hci_cp_set_conn_encrypt cp; | 853 | struct hci_cp_set_conn_encrypt cp; |
986 | cp.handle = cpu_to_le16(conn->handle); | 854 | cp.handle = cpu_to_le16(conn->handle); |
987 | cp.encrypt = 1; | 855 | cp.encrypt = 1; |
988 | hci_send_cmd(conn->hdev, OGF_LINK_CTL, | 856 | hci_send_cmd(conn->hdev, |
989 | OCF_SET_CONN_ENCRYPT, sizeof(cp), &cp); | 857 | HCI_OP_SET_CONN_ENCRYPT, sizeof(cp), &cp); |
990 | } else { | 858 | } else { |
991 | clear_bit(HCI_CONN_ENCRYPT_PEND, &conn->pend); | 859 | clear_bit(HCI_CONN_ENCRYPT_PEND, &conn->pend); |
992 | hci_encrypt_cfm(conn, ev->status, 0x00); | 860 | hci_encrypt_cfm(conn, ev->status, 0x00); |
@@ -997,10 +865,16 @@ static inline void hci_auth_complete_evt(struct hci_dev *hdev, struct sk_buff *s | |||
997 | hci_dev_unlock(hdev); | 865 | hci_dev_unlock(hdev); |
998 | } | 866 | } |
999 | 867 | ||
1000 | /* Encryption Change */ | 868 | static inline void hci_remote_name_evt(struct hci_dev *hdev, struct sk_buff *skb) |
869 | { | ||
870 | BT_DBG("%s", hdev->name); | ||
871 | |||
872 | hci_conn_check_pending(hdev); | ||
873 | } | ||
874 | |||
1001 | static inline void hci_encrypt_change_evt(struct hci_dev *hdev, struct sk_buff *skb) | 875 | static inline void hci_encrypt_change_evt(struct hci_dev *hdev, struct sk_buff *skb) |
1002 | { | 876 | { |
1003 | struct hci_ev_encrypt_change *ev = (struct hci_ev_encrypt_change *) skb->data; | 877 | struct hci_ev_encrypt_change *ev = (void *) skb->data; |
1004 | struct hci_conn *conn; | 878 | struct hci_conn *conn; |
1005 | 879 | ||
1006 | BT_DBG("%s status %d", hdev->name, ev->status); | 880 | BT_DBG("%s status %d", hdev->name, ev->status); |
@@ -1024,10 +898,9 @@ static inline void hci_encrypt_change_evt(struct hci_dev *hdev, struct sk_buff * | |||
1024 | hci_dev_unlock(hdev); | 898 | hci_dev_unlock(hdev); |
1025 | } | 899 | } |
1026 | 900 | ||
1027 | /* Change Connection Link Key Complete */ | 901 | static inline void hci_change_link_key_complete_evt(struct hci_dev *hdev, struct sk_buff *skb) |
1028 | static inline void hci_change_conn_link_key_complete_evt(struct hci_dev *hdev, struct sk_buff *skb) | ||
1029 | { | 902 | { |
1030 | struct hci_ev_change_conn_link_key_complete *ev = (struct hci_ev_change_conn_link_key_complete *) skb->data; | 903 | struct hci_ev_change_link_key_complete *ev = (void *) skb->data; |
1031 | struct hci_conn *conn; | 904 | struct hci_conn *conn; |
1032 | 905 | ||
1033 | BT_DBG("%s status %d", hdev->name, ev->status); | 906 | BT_DBG("%s status %d", hdev->name, ev->status); |
@@ -1047,25 +920,263 @@ static inline void hci_change_conn_link_key_complete_evt(struct hci_dev *hdev, s | |||
1047 | hci_dev_unlock(hdev); | 920 | hci_dev_unlock(hdev); |
1048 | } | 921 | } |
1049 | 922 | ||
1050 | /* Pin Code Request*/ | 923 | static inline void hci_remote_features_evt(struct hci_dev *hdev, struct sk_buff *skb) |
1051 | static inline void hci_pin_code_request_evt(struct hci_dev *hdev, struct sk_buff *skb) | ||
1052 | { | 924 | { |
925 | struct hci_ev_remote_features *ev = (void *) skb->data; | ||
926 | struct hci_conn *conn; | ||
927 | |||
928 | BT_DBG("%s status %d", hdev->name, ev->status); | ||
929 | |||
930 | if (ev->status) | ||
931 | return; | ||
932 | |||
933 | hci_dev_lock(hdev); | ||
934 | |||
935 | conn = hci_conn_hash_lookup_handle(hdev, __le16_to_cpu(ev->handle)); | ||
936 | if (conn) | ||
937 | memcpy(conn->features, ev->features, 8); | ||
938 | |||
939 | hci_dev_unlock(hdev); | ||
1053 | } | 940 | } |
1054 | 941 | ||
1055 | /* Link Key Request */ | 942 | static inline void hci_remote_version_evt(struct hci_dev *hdev, struct sk_buff *skb) |
1056 | static inline void hci_link_key_request_evt(struct hci_dev *hdev, struct sk_buff *skb) | ||
1057 | { | 943 | { |
944 | BT_DBG("%s", hdev->name); | ||
1058 | } | 945 | } |
1059 | 946 | ||
1060 | /* Link Key Notification */ | 947 | static inline void hci_qos_setup_complete_evt(struct hci_dev *hdev, struct sk_buff *skb) |
1061 | static inline void hci_link_key_notify_evt(struct hci_dev *hdev, struct sk_buff *skb) | ||
1062 | { | 948 | { |
949 | BT_DBG("%s", hdev->name); | ||
1063 | } | 950 | } |
1064 | 951 | ||
1065 | /* Remote Features */ | 952 | static inline void hci_cmd_complete_evt(struct hci_dev *hdev, struct sk_buff *skb) |
1066 | static inline void hci_remote_features_evt(struct hci_dev *hdev, struct sk_buff *skb) | ||
1067 | { | 953 | { |
1068 | struct hci_ev_remote_features *ev = (struct hci_ev_remote_features *) skb->data; | 954 | struct hci_ev_cmd_complete *ev = (void *) skb->data; |
955 | __u16 opcode; | ||
956 | |||
957 | skb_pull(skb, sizeof(*ev)); | ||
958 | |||
959 | opcode = __le16_to_cpu(ev->opcode); | ||
960 | |||
961 | switch (opcode) { | ||
962 | case HCI_OP_INQUIRY_CANCEL: | ||
963 | hci_cc_inquiry_cancel(hdev, skb); | ||
964 | break; | ||
965 | |||
966 | case HCI_OP_EXIT_PERIODIC_INQ: | ||
967 | hci_cc_exit_periodic_inq(hdev, skb); | ||
968 | break; | ||
969 | |||
970 | case HCI_OP_REMOTE_NAME_REQ_CANCEL: | ||
971 | hci_cc_remote_name_req_cancel(hdev, skb); | ||
972 | break; | ||
973 | |||
974 | case HCI_OP_ROLE_DISCOVERY: | ||
975 | hci_cc_role_discovery(hdev, skb); | ||
976 | break; | ||
977 | |||
978 | case HCI_OP_WRITE_LINK_POLICY: | ||
979 | hci_cc_write_link_policy(hdev, skb); | ||
980 | break; | ||
981 | |||
982 | case HCI_OP_RESET: | ||
983 | hci_cc_reset(hdev, skb); | ||
984 | break; | ||
985 | |||
986 | case HCI_OP_WRITE_LOCAL_NAME: | ||
987 | hci_cc_write_local_name(hdev, skb); | ||
988 | break; | ||
989 | |||
990 | case HCI_OP_READ_LOCAL_NAME: | ||
991 | hci_cc_read_local_name(hdev, skb); | ||
992 | break; | ||
993 | |||
994 | case HCI_OP_WRITE_AUTH_ENABLE: | ||
995 | hci_cc_write_auth_enable(hdev, skb); | ||
996 | break; | ||
997 | |||
998 | case HCI_OP_WRITE_ENCRYPT_MODE: | ||
999 | hci_cc_write_encrypt_mode(hdev, skb); | ||
1000 | break; | ||
1001 | |||
1002 | case HCI_OP_WRITE_SCAN_ENABLE: | ||
1003 | hci_cc_write_scan_enable(hdev, skb); | ||
1004 | break; | ||
1005 | |||
1006 | case HCI_OP_READ_CLASS_OF_DEV: | ||
1007 | hci_cc_read_class_of_dev(hdev, skb); | ||
1008 | break; | ||
1009 | |||
1010 | case HCI_OP_WRITE_CLASS_OF_DEV: | ||
1011 | hci_cc_write_class_of_dev(hdev, skb); | ||
1012 | break; | ||
1013 | |||
1014 | case HCI_OP_READ_VOICE_SETTING: | ||
1015 | hci_cc_read_voice_setting(hdev, skb); | ||
1016 | break; | ||
1017 | |||
1018 | case HCI_OP_WRITE_VOICE_SETTING: | ||
1019 | hci_cc_write_voice_setting(hdev, skb); | ||
1020 | break; | ||
1021 | |||
1022 | case HCI_OP_HOST_BUFFER_SIZE: | ||
1023 | hci_cc_host_buffer_size(hdev, skb); | ||
1024 | break; | ||
1025 | |||
1026 | case HCI_OP_READ_LOCAL_VERSION: | ||
1027 | hci_cc_read_local_version(hdev, skb); | ||
1028 | break; | ||
1029 | |||
1030 | case HCI_OP_READ_LOCAL_COMMANDS: | ||
1031 | hci_cc_read_local_commands(hdev, skb); | ||
1032 | break; | ||
1033 | |||
1034 | case HCI_OP_READ_LOCAL_FEATURES: | ||
1035 | hci_cc_read_local_features(hdev, skb); | ||
1036 | break; | ||
1037 | |||
1038 | case HCI_OP_READ_BUFFER_SIZE: | ||
1039 | hci_cc_read_buffer_size(hdev, skb); | ||
1040 | break; | ||
1041 | |||
1042 | case HCI_OP_READ_BD_ADDR: | ||
1043 | hci_cc_read_bd_addr(hdev, skb); | ||
1044 | break; | ||
1045 | |||
1046 | default: | ||
1047 | BT_DBG("%s opcode 0x%x", hdev->name, opcode); | ||
1048 | break; | ||
1049 | } | ||
1050 | |||
1051 | if (ev->ncmd) { | ||
1052 | atomic_set(&hdev->cmd_cnt, 1); | ||
1053 | if (!skb_queue_empty(&hdev->cmd_q)) | ||
1054 | hci_sched_cmd(hdev); | ||
1055 | } | ||
1056 | } | ||
1057 | |||
1058 | static inline void hci_cmd_status_evt(struct hci_dev *hdev, struct sk_buff *skb) | ||
1059 | { | ||
1060 | struct hci_ev_cmd_status *ev = (void *) skb->data; | ||
1061 | __u16 opcode; | ||
1062 | |||
1063 | skb_pull(skb, sizeof(*ev)); | ||
1064 | |||
1065 | opcode = __le16_to_cpu(ev->opcode); | ||
1066 | |||
1067 | switch (opcode) { | ||
1068 | case HCI_OP_INQUIRY: | ||
1069 | hci_cs_inquiry(hdev, ev->status); | ||
1070 | break; | ||
1071 | |||
1072 | case HCI_OP_CREATE_CONN: | ||
1073 | hci_cs_create_conn(hdev, ev->status); | ||
1074 | break; | ||
1075 | |||
1076 | case HCI_OP_ADD_SCO: | ||
1077 | hci_cs_add_sco(hdev, ev->status); | ||
1078 | break; | ||
1079 | |||
1080 | case HCI_OP_REMOTE_NAME_REQ: | ||
1081 | hci_cs_remote_name_req(hdev, ev->status); | ||
1082 | break; | ||
1083 | |||
1084 | case HCI_OP_SETUP_SYNC_CONN: | ||
1085 | hci_cs_setup_sync_conn(hdev, ev->status); | ||
1086 | break; | ||
1087 | |||
1088 | case HCI_OP_SNIFF_MODE: | ||
1089 | hci_cs_sniff_mode(hdev, ev->status); | ||
1090 | break; | ||
1091 | |||
1092 | case HCI_OP_EXIT_SNIFF_MODE: | ||
1093 | hci_cs_exit_sniff_mode(hdev, ev->status); | ||
1094 | break; | ||
1095 | |||
1096 | default: | ||
1097 | BT_DBG("%s opcode 0x%x", hdev->name, opcode); | ||
1098 | break; | ||
1099 | } | ||
1100 | |||
1101 | if (ev->ncmd) { | ||
1102 | atomic_set(&hdev->cmd_cnt, 1); | ||
1103 | if (!skb_queue_empty(&hdev->cmd_q)) | ||
1104 | hci_sched_cmd(hdev); | ||
1105 | } | ||
1106 | } | ||
1107 | |||
1108 | static inline void hci_role_change_evt(struct hci_dev *hdev, struct sk_buff *skb) | ||
1109 | { | ||
1110 | struct hci_ev_role_change *ev = (void *) skb->data; | ||
1111 | struct hci_conn *conn; | ||
1112 | |||
1113 | BT_DBG("%s status %d", hdev->name, ev->status); | ||
1114 | |||
1115 | hci_dev_lock(hdev); | ||
1116 | |||
1117 | conn = hci_conn_hash_lookup_ba(hdev, ACL_LINK, &ev->bdaddr); | ||
1118 | if (conn) { | ||
1119 | if (!ev->status) { | ||
1120 | if (ev->role) | ||
1121 | conn->link_mode &= ~HCI_LM_MASTER; | ||
1122 | else | ||
1123 | conn->link_mode |= HCI_LM_MASTER; | ||
1124 | } | ||
1125 | |||
1126 | clear_bit(HCI_CONN_RSWITCH_PEND, &conn->pend); | ||
1127 | |||
1128 | hci_role_switch_cfm(conn, ev->status, ev->role); | ||
1129 | } | ||
1130 | |||
1131 | hci_dev_unlock(hdev); | ||
1132 | } | ||
1133 | |||
1134 | static inline void hci_num_comp_pkts_evt(struct hci_dev *hdev, struct sk_buff *skb) | ||
1135 | { | ||
1136 | struct hci_ev_num_comp_pkts *ev = (void *) skb->data; | ||
1137 | __le16 *ptr; | ||
1138 | int i; | ||
1139 | |||
1140 | skb_pull(skb, sizeof(*ev)); | ||
1141 | |||
1142 | BT_DBG("%s num_hndl %d", hdev->name, ev->num_hndl); | ||
1143 | |||
1144 | if (skb->len < ev->num_hndl * 4) { | ||
1145 | BT_DBG("%s bad parameters", hdev->name); | ||
1146 | return; | ||
1147 | } | ||
1148 | |||
1149 | tasklet_disable(&hdev->tx_task); | ||
1150 | |||
1151 | for (i = 0, ptr = (__le16 *) skb->data; i < ev->num_hndl; i++) { | ||
1152 | struct hci_conn *conn; | ||
1153 | __u16 handle, count; | ||
1154 | |||
1155 | handle = __le16_to_cpu(get_unaligned(ptr++)); | ||
1156 | count = __le16_to_cpu(get_unaligned(ptr++)); | ||
1157 | |||
1158 | conn = hci_conn_hash_lookup_handle(hdev, handle); | ||
1159 | if (conn) { | ||
1160 | conn->sent -= count; | ||
1161 | |||
1162 | if (conn->type == ACL_LINK) { | ||
1163 | if ((hdev->acl_cnt += count) > hdev->acl_pkts) | ||
1164 | hdev->acl_cnt = hdev->acl_pkts; | ||
1165 | } else { | ||
1166 | if ((hdev->sco_cnt += count) > hdev->sco_pkts) | ||
1167 | hdev->sco_cnt = hdev->sco_pkts; | ||
1168 | } | ||
1169 | } | ||
1170 | } | ||
1171 | |||
1172 | hci_sched_tx(hdev); | ||
1173 | |||
1174 | tasklet_enable(&hdev->tx_task); | ||
1175 | } | ||
1176 | |||
1177 | static inline void hci_mode_change_evt(struct hci_dev *hdev, struct sk_buff *skb) | ||
1178 | { | ||
1179 | struct hci_ev_mode_change *ev = (void *) skb->data; | ||
1069 | struct hci_conn *conn; | 1180 | struct hci_conn *conn; |
1070 | 1181 | ||
1071 | BT_DBG("%s status %d", hdev->name, ev->status); | 1182 | BT_DBG("%s status %d", hdev->name, ev->status); |
@@ -1073,17 +1184,39 @@ static inline void hci_remote_features_evt(struct hci_dev *hdev, struct sk_buff | |||
1073 | hci_dev_lock(hdev); | 1184 | hci_dev_lock(hdev); |
1074 | 1185 | ||
1075 | conn = hci_conn_hash_lookup_handle(hdev, __le16_to_cpu(ev->handle)); | 1186 | conn = hci_conn_hash_lookup_handle(hdev, __le16_to_cpu(ev->handle)); |
1076 | if (conn && !ev->status) { | 1187 | if (conn) { |
1077 | memcpy(conn->features, ev->features, sizeof(conn->features)); | 1188 | conn->mode = ev->mode; |
1189 | conn->interval = __le16_to_cpu(ev->interval); | ||
1190 | |||
1191 | if (!test_and_clear_bit(HCI_CONN_MODE_CHANGE_PEND, &conn->pend)) { | ||
1192 | if (conn->mode == HCI_CM_ACTIVE) | ||
1193 | conn->power_save = 1; | ||
1194 | else | ||
1195 | conn->power_save = 0; | ||
1196 | } | ||
1078 | } | 1197 | } |
1079 | 1198 | ||
1080 | hci_dev_unlock(hdev); | 1199 | hci_dev_unlock(hdev); |
1081 | } | 1200 | } |
1082 | 1201 | ||
1083 | /* Clock Offset */ | 1202 | static inline void hci_pin_code_request_evt(struct hci_dev *hdev, struct sk_buff *skb) |
1203 | { | ||
1204 | BT_DBG("%s", hdev->name); | ||
1205 | } | ||
1206 | |||
1207 | static inline void hci_link_key_request_evt(struct hci_dev *hdev, struct sk_buff *skb) | ||
1208 | { | ||
1209 | BT_DBG("%s", hdev->name); | ||
1210 | } | ||
1211 | |||
1212 | static inline void hci_link_key_notify_evt(struct hci_dev *hdev, struct sk_buff *skb) | ||
1213 | { | ||
1214 | BT_DBG("%s", hdev->name); | ||
1215 | } | ||
1216 | |||
1084 | static inline void hci_clock_offset_evt(struct hci_dev *hdev, struct sk_buff *skb) | 1217 | static inline void hci_clock_offset_evt(struct hci_dev *hdev, struct sk_buff *skb) |
1085 | { | 1218 | { |
1086 | struct hci_ev_clock_offset *ev = (struct hci_ev_clock_offset *) skb->data; | 1219 | struct hci_ev_clock_offset *ev = (void *) skb->data; |
1087 | struct hci_conn *conn; | 1220 | struct hci_conn *conn; |
1088 | 1221 | ||
1089 | BT_DBG("%s status %d", hdev->name, ev->status); | 1222 | BT_DBG("%s status %d", hdev->name, ev->status); |
@@ -1103,10 +1236,9 @@ static inline void hci_clock_offset_evt(struct hci_dev *hdev, struct sk_buff *sk | |||
1103 | hci_dev_unlock(hdev); | 1236 | hci_dev_unlock(hdev); |
1104 | } | 1237 | } |
1105 | 1238 | ||
1106 | /* Page Scan Repetition Mode */ | ||
1107 | static inline void hci_pscan_rep_mode_evt(struct hci_dev *hdev, struct sk_buff *skb) | 1239 | static inline void hci_pscan_rep_mode_evt(struct hci_dev *hdev, struct sk_buff *skb) |
1108 | { | 1240 | { |
1109 | struct hci_ev_pscan_rep_mode *ev = (struct hci_ev_pscan_rep_mode *) skb->data; | 1241 | struct hci_ev_pscan_rep_mode *ev = (void *) skb->data; |
1110 | struct inquiry_entry *ie; | 1242 | struct inquiry_entry *ie; |
1111 | 1243 | ||
1112 | BT_DBG("%s", hdev->name); | 1244 | BT_DBG("%s", hdev->name); |
@@ -1121,10 +1253,91 @@ static inline void hci_pscan_rep_mode_evt(struct hci_dev *hdev, struct sk_buff * | |||
1121 | hci_dev_unlock(hdev); | 1253 | hci_dev_unlock(hdev); |
1122 | } | 1254 | } |
1123 | 1255 | ||
1124 | /* Sniff Subrate */ | 1256 | static inline void hci_inquiry_result_with_rssi_evt(struct hci_dev *hdev, struct sk_buff *skb) |
1257 | { | ||
1258 | struct inquiry_data data; | ||
1259 | int num_rsp = *((__u8 *) skb->data); | ||
1260 | |||
1261 | BT_DBG("%s num_rsp %d", hdev->name, num_rsp); | ||
1262 | |||
1263 | if (!num_rsp) | ||
1264 | return; | ||
1265 | |||
1266 | hci_dev_lock(hdev); | ||
1267 | |||
1268 | if ((skb->len - 1) / num_rsp != sizeof(struct inquiry_info_with_rssi)) { | ||
1269 | struct inquiry_info_with_rssi_and_pscan_mode *info = (void *) (skb->data + 1); | ||
1270 | |||
1271 | for (; num_rsp; num_rsp--) { | ||
1272 | bacpy(&data.bdaddr, &info->bdaddr); | ||
1273 | data.pscan_rep_mode = info->pscan_rep_mode; | ||
1274 | data.pscan_period_mode = info->pscan_period_mode; | ||
1275 | data.pscan_mode = info->pscan_mode; | ||
1276 | memcpy(data.dev_class, info->dev_class, 3); | ||
1277 | data.clock_offset = info->clock_offset; | ||
1278 | data.rssi = info->rssi; | ||
1279 | info++; | ||
1280 | hci_inquiry_cache_update(hdev, &data); | ||
1281 | } | ||
1282 | } else { | ||
1283 | struct inquiry_info_with_rssi *info = (void *) (skb->data + 1); | ||
1284 | |||
1285 | for (; num_rsp; num_rsp--) { | ||
1286 | bacpy(&data.bdaddr, &info->bdaddr); | ||
1287 | data.pscan_rep_mode = info->pscan_rep_mode; | ||
1288 | data.pscan_period_mode = info->pscan_period_mode; | ||
1289 | data.pscan_mode = 0x00; | ||
1290 | memcpy(data.dev_class, info->dev_class, 3); | ||
1291 | data.clock_offset = info->clock_offset; | ||
1292 | data.rssi = info->rssi; | ||
1293 | info++; | ||
1294 | hci_inquiry_cache_update(hdev, &data); | ||
1295 | } | ||
1296 | } | ||
1297 | |||
1298 | hci_dev_unlock(hdev); | ||
1299 | } | ||
1300 | |||
1301 | static inline void hci_remote_ext_features_evt(struct hci_dev *hdev, struct sk_buff *skb) | ||
1302 | { | ||
1303 | BT_DBG("%s", hdev->name); | ||
1304 | } | ||
1305 | |||
1306 | static inline void hci_sync_conn_complete_evt(struct hci_dev *hdev, struct sk_buff *skb) | ||
1307 | { | ||
1308 | struct hci_ev_sync_conn_complete *ev = (void *) skb->data; | ||
1309 | struct hci_conn *conn; | ||
1310 | |||
1311 | BT_DBG("%s status %d", hdev->name, ev->status); | ||
1312 | |||
1313 | hci_dev_lock(hdev); | ||
1314 | |||
1315 | conn = hci_conn_hash_lookup_ba(hdev, ev->link_type, &ev->bdaddr); | ||
1316 | if (!conn) | ||
1317 | goto unlock; | ||
1318 | |||
1319 | if (!ev->status) { | ||
1320 | conn->handle = __le16_to_cpu(ev->handle); | ||
1321 | conn->state = BT_CONNECTED; | ||
1322 | } else | ||
1323 | conn->state = BT_CLOSED; | ||
1324 | |||
1325 | hci_proto_connect_cfm(conn, ev->status); | ||
1326 | if (ev->status) | ||
1327 | hci_conn_del(conn); | ||
1328 | |||
1329 | unlock: | ||
1330 | hci_dev_unlock(hdev); | ||
1331 | } | ||
1332 | |||
1333 | static inline void hci_sync_conn_changed_evt(struct hci_dev *hdev, struct sk_buff *skb) | ||
1334 | { | ||
1335 | BT_DBG("%s", hdev->name); | ||
1336 | } | ||
1337 | |||
1125 | static inline void hci_sniff_subrate_evt(struct hci_dev *hdev, struct sk_buff *skb) | 1338 | static inline void hci_sniff_subrate_evt(struct hci_dev *hdev, struct sk_buff *skb) |
1126 | { | 1339 | { |
1127 | struct hci_ev_sniff_subrate *ev = (struct hci_ev_sniff_subrate *) skb->data; | 1340 | struct hci_ev_sniff_subrate *ev = (void *) skb->data; |
1128 | struct hci_conn *conn; | 1341 | struct hci_conn *conn; |
1129 | 1342 | ||
1130 | BT_DBG("%s status %d", hdev->name, ev->status); | 1343 | BT_DBG("%s status %d", hdev->name, ev->status); |
@@ -1138,22 +1351,42 @@ static inline void hci_sniff_subrate_evt(struct hci_dev *hdev, struct sk_buff *s | |||
1138 | hci_dev_unlock(hdev); | 1351 | hci_dev_unlock(hdev); |
1139 | } | 1352 | } |
1140 | 1353 | ||
1141 | void hci_event_packet(struct hci_dev *hdev, struct sk_buff *skb) | 1354 | static inline void hci_extended_inquiry_result_evt(struct hci_dev *hdev, struct sk_buff *skb) |
1142 | { | 1355 | { |
1143 | struct hci_event_hdr *hdr = (struct hci_event_hdr *) skb->data; | 1356 | struct inquiry_data data; |
1144 | struct hci_ev_cmd_complete *ec; | 1357 | struct extended_inquiry_info *info = (void *) (skb->data + 1); |
1145 | struct hci_ev_cmd_status *cs; | 1358 | int num_rsp = *((__u8 *) skb->data); |
1146 | u16 opcode, ocf, ogf; | ||
1147 | 1359 | ||
1148 | skb_pull(skb, HCI_EVENT_HDR_SIZE); | 1360 | BT_DBG("%s num_rsp %d", hdev->name, num_rsp); |
1149 | 1361 | ||
1150 | BT_DBG("%s evt 0x%x", hdev->name, hdr->evt); | 1362 | if (!num_rsp) |
1363 | return; | ||
1151 | 1364 | ||
1152 | switch (hdr->evt) { | 1365 | hci_dev_lock(hdev); |
1153 | case HCI_EV_NUM_COMP_PKTS: | 1366 | |
1154 | hci_num_comp_pkts_evt(hdev, skb); | 1367 | for (; num_rsp; num_rsp--) { |
1155 | break; | 1368 | bacpy(&data.bdaddr, &info->bdaddr); |
1369 | data.pscan_rep_mode = info->pscan_rep_mode; | ||
1370 | data.pscan_period_mode = info->pscan_period_mode; | ||
1371 | data.pscan_mode = 0x00; | ||
1372 | memcpy(data.dev_class, info->dev_class, 3); | ||
1373 | data.clock_offset = info->clock_offset; | ||
1374 | data.rssi = info->rssi; | ||
1375 | info++; | ||
1376 | hci_inquiry_cache_update(hdev, &data); | ||
1377 | } | ||
1156 | 1378 | ||
1379 | hci_dev_unlock(hdev); | ||
1380 | } | ||
1381 | |||
1382 | void hci_event_packet(struct hci_dev *hdev, struct sk_buff *skb) | ||
1383 | { | ||
1384 | struct hci_event_hdr *hdr = (void *) skb->data; | ||
1385 | __u8 event = hdr->evt; | ||
1386 | |||
1387 | skb_pull(skb, HCI_EVENT_HDR_SIZE); | ||
1388 | |||
1389 | switch (event) { | ||
1157 | case HCI_EV_INQUIRY_COMPLETE: | 1390 | case HCI_EV_INQUIRY_COMPLETE: |
1158 | hci_inquiry_complete_evt(hdev, skb); | 1391 | hci_inquiry_complete_evt(hdev, skb); |
1159 | break; | 1392 | break; |
@@ -1162,44 +1395,64 @@ void hci_event_packet(struct hci_dev *hdev, struct sk_buff *skb) | |||
1162 | hci_inquiry_result_evt(hdev, skb); | 1395 | hci_inquiry_result_evt(hdev, skb); |
1163 | break; | 1396 | break; |
1164 | 1397 | ||
1165 | case HCI_EV_INQUIRY_RESULT_WITH_RSSI: | 1398 | case HCI_EV_CONN_COMPLETE: |
1166 | hci_inquiry_result_with_rssi_evt(hdev, skb); | 1399 | hci_conn_complete_evt(hdev, skb); |
1167 | break; | ||
1168 | |||
1169 | case HCI_EV_EXTENDED_INQUIRY_RESULT: | ||
1170 | hci_extended_inquiry_result_evt(hdev, skb); | ||
1171 | break; | 1400 | break; |
1172 | 1401 | ||
1173 | case HCI_EV_CONN_REQUEST: | 1402 | case HCI_EV_CONN_REQUEST: |
1174 | hci_conn_request_evt(hdev, skb); | 1403 | hci_conn_request_evt(hdev, skb); |
1175 | break; | 1404 | break; |
1176 | 1405 | ||
1177 | case HCI_EV_CONN_COMPLETE: | ||
1178 | hci_conn_complete_evt(hdev, skb); | ||
1179 | break; | ||
1180 | |||
1181 | case HCI_EV_DISCONN_COMPLETE: | 1406 | case HCI_EV_DISCONN_COMPLETE: |
1182 | hci_disconn_complete_evt(hdev, skb); | 1407 | hci_disconn_complete_evt(hdev, skb); |
1183 | break; | 1408 | break; |
1184 | 1409 | ||
1185 | case HCI_EV_ROLE_CHANGE: | ||
1186 | hci_role_change_evt(hdev, skb); | ||
1187 | break; | ||
1188 | |||
1189 | case HCI_EV_MODE_CHANGE: | ||
1190 | hci_mode_change_evt(hdev, skb); | ||
1191 | break; | ||
1192 | |||
1193 | case HCI_EV_AUTH_COMPLETE: | 1410 | case HCI_EV_AUTH_COMPLETE: |
1194 | hci_auth_complete_evt(hdev, skb); | 1411 | hci_auth_complete_evt(hdev, skb); |
1195 | break; | 1412 | break; |
1196 | 1413 | ||
1414 | case HCI_EV_REMOTE_NAME: | ||
1415 | hci_remote_name_evt(hdev, skb); | ||
1416 | break; | ||
1417 | |||
1197 | case HCI_EV_ENCRYPT_CHANGE: | 1418 | case HCI_EV_ENCRYPT_CHANGE: |
1198 | hci_encrypt_change_evt(hdev, skb); | 1419 | hci_encrypt_change_evt(hdev, skb); |
1199 | break; | 1420 | break; |
1200 | 1421 | ||
1201 | case HCI_EV_CHANGE_CONN_LINK_KEY_COMPLETE: | 1422 | case HCI_EV_CHANGE_LINK_KEY_COMPLETE: |
1202 | hci_change_conn_link_key_complete_evt(hdev, skb); | 1423 | hci_change_link_key_complete_evt(hdev, skb); |
1424 | break; | ||
1425 | |||
1426 | case HCI_EV_REMOTE_FEATURES: | ||
1427 | hci_remote_features_evt(hdev, skb); | ||
1428 | break; | ||
1429 | |||
1430 | case HCI_EV_REMOTE_VERSION: | ||
1431 | hci_remote_version_evt(hdev, skb); | ||
1432 | break; | ||
1433 | |||
1434 | case HCI_EV_QOS_SETUP_COMPLETE: | ||
1435 | hci_qos_setup_complete_evt(hdev, skb); | ||
1436 | break; | ||
1437 | |||
1438 | case HCI_EV_CMD_COMPLETE: | ||
1439 | hci_cmd_complete_evt(hdev, skb); | ||
1440 | break; | ||
1441 | |||
1442 | case HCI_EV_CMD_STATUS: | ||
1443 | hci_cmd_status_evt(hdev, skb); | ||
1444 | break; | ||
1445 | |||
1446 | case HCI_EV_ROLE_CHANGE: | ||
1447 | hci_role_change_evt(hdev, skb); | ||
1448 | break; | ||
1449 | |||
1450 | case HCI_EV_NUM_COMP_PKTS: | ||
1451 | hci_num_comp_pkts_evt(hdev, skb); | ||
1452 | break; | ||
1453 | |||
1454 | case HCI_EV_MODE_CHANGE: | ||
1455 | hci_mode_change_evt(hdev, skb); | ||
1203 | break; | 1456 | break; |
1204 | 1457 | ||
1205 | case HCI_EV_PIN_CODE_REQ: | 1458 | case HCI_EV_PIN_CODE_REQ: |
@@ -1214,10 +1467,6 @@ void hci_event_packet(struct hci_dev *hdev, struct sk_buff *skb) | |||
1214 | hci_link_key_notify_evt(hdev, skb); | 1467 | hci_link_key_notify_evt(hdev, skb); |
1215 | break; | 1468 | break; |
1216 | 1469 | ||
1217 | case HCI_EV_REMOTE_FEATURES: | ||
1218 | hci_remote_features_evt(hdev, skb); | ||
1219 | break; | ||
1220 | |||
1221 | case HCI_EV_CLOCK_OFFSET: | 1470 | case HCI_EV_CLOCK_OFFSET: |
1222 | hci_clock_offset_evt(hdev, skb); | 1471 | hci_clock_offset_evt(hdev, skb); |
1223 | break; | 1472 | break; |
@@ -1226,82 +1475,32 @@ void hci_event_packet(struct hci_dev *hdev, struct sk_buff *skb) | |||
1226 | hci_pscan_rep_mode_evt(hdev, skb); | 1475 | hci_pscan_rep_mode_evt(hdev, skb); |
1227 | break; | 1476 | break; |
1228 | 1477 | ||
1229 | case HCI_EV_SNIFF_SUBRATE: | 1478 | case HCI_EV_INQUIRY_RESULT_WITH_RSSI: |
1230 | hci_sniff_subrate_evt(hdev, skb); | 1479 | hci_inquiry_result_with_rssi_evt(hdev, skb); |
1231 | break; | 1480 | break; |
1232 | 1481 | ||
1233 | case HCI_EV_CMD_STATUS: | 1482 | case HCI_EV_REMOTE_EXT_FEATURES: |
1234 | cs = (struct hci_ev_cmd_status *) skb->data; | 1483 | hci_remote_ext_features_evt(hdev, skb); |
1235 | skb_pull(skb, sizeof(cs)); | ||
1236 | |||
1237 | opcode = __le16_to_cpu(cs->opcode); | ||
1238 | ogf = hci_opcode_ogf(opcode); | ||
1239 | ocf = hci_opcode_ocf(opcode); | ||
1240 | |||
1241 | switch (ogf) { | ||
1242 | case OGF_INFO_PARAM: | ||
1243 | hci_cs_info_param(hdev, ocf, cs->status); | ||
1244 | break; | ||
1245 | |||
1246 | case OGF_HOST_CTL: | ||
1247 | hci_cs_host_ctl(hdev, ocf, cs->status); | ||
1248 | break; | ||
1249 | |||
1250 | case OGF_LINK_CTL: | ||
1251 | hci_cs_link_ctl(hdev, ocf, cs->status); | ||
1252 | break; | ||
1253 | |||
1254 | case OGF_LINK_POLICY: | ||
1255 | hci_cs_link_policy(hdev, ocf, cs->status); | ||
1256 | break; | ||
1257 | |||
1258 | default: | ||
1259 | BT_DBG("%s Command Status OGF %x", hdev->name, ogf); | ||
1260 | break; | ||
1261 | } | ||
1262 | |||
1263 | if (cs->ncmd) { | ||
1264 | atomic_set(&hdev->cmd_cnt, 1); | ||
1265 | if (!skb_queue_empty(&hdev->cmd_q)) | ||
1266 | hci_sched_cmd(hdev); | ||
1267 | } | ||
1268 | break; | 1484 | break; |
1269 | 1485 | ||
1270 | case HCI_EV_CMD_COMPLETE: | 1486 | case HCI_EV_SYNC_CONN_COMPLETE: |
1271 | ec = (struct hci_ev_cmd_complete *) skb->data; | 1487 | hci_sync_conn_complete_evt(hdev, skb); |
1272 | skb_pull(skb, sizeof(*ec)); | 1488 | break; |
1273 | |||
1274 | opcode = __le16_to_cpu(ec->opcode); | ||
1275 | ogf = hci_opcode_ogf(opcode); | ||
1276 | ocf = hci_opcode_ocf(opcode); | ||
1277 | |||
1278 | switch (ogf) { | ||
1279 | case OGF_INFO_PARAM: | ||
1280 | hci_cc_info_param(hdev, ocf, skb); | ||
1281 | break; | ||
1282 | |||
1283 | case OGF_HOST_CTL: | ||
1284 | hci_cc_host_ctl(hdev, ocf, skb); | ||
1285 | break; | ||
1286 | 1489 | ||
1287 | case OGF_LINK_CTL: | 1490 | case HCI_EV_SYNC_CONN_CHANGED: |
1288 | hci_cc_link_ctl(hdev, ocf, skb); | 1491 | hci_sync_conn_changed_evt(hdev, skb); |
1289 | break; | 1492 | break; |
1290 | 1493 | ||
1291 | case OGF_LINK_POLICY: | 1494 | case HCI_EV_SNIFF_SUBRATE: |
1292 | hci_cc_link_policy(hdev, ocf, skb); | 1495 | hci_sniff_subrate_evt(hdev, skb); |
1293 | break; | 1496 | break; |
1294 | 1497 | ||
1295 | default: | 1498 | case HCI_EV_EXTENDED_INQUIRY_RESULT: |
1296 | BT_DBG("%s Command Completed OGF %x", hdev->name, ogf); | 1499 | hci_extended_inquiry_result_evt(hdev, skb); |
1297 | break; | 1500 | break; |
1298 | } | ||
1299 | 1501 | ||
1300 | if (ec->ncmd) { | 1502 | default: |
1301 | atomic_set(&hdev->cmd_cnt, 1); | 1503 | BT_DBG("%s event 0x%x", hdev->name, event); |
1302 | if (!skb_queue_empty(&hdev->cmd_q)) | ||
1303 | hci_sched_cmd(hdev); | ||
1304 | } | ||
1305 | break; | 1504 | break; |
1306 | } | 1505 | } |
1307 | 1506 | ||