|
51 | 51 | ADV_FLAG_SENT, |
52 | 52 | /** Currently performing proxy advertising */ |
53 | 53 | ADV_FLAG_PROXY, |
54 | | - /** The proxy has been start, but maybe pending. */ |
55 | | - ADV_FLAG_PROXY_START, |
56 | 54 | /** The send-call has been pending. */ |
57 | 55 | ADV_FLAG_SCHEDULE_PENDING, |
58 | 56 | /** Custom adv params have been set, we need to update the parameters on |
@@ -286,7 +284,6 @@ static const char * const adv_tag_to_str[] = { |
286 | 284 | static bool schedule_send_with_mask(struct bt_mesh_ext_adv *ext_adv, int ignore_mask) |
287 | 285 | { |
288 | 286 | if (atomic_test_and_clear_bit(ext_adv->flags, ADV_FLAG_PROXY)) { |
289 | | - atomic_clear_bit(ext_adv->flags, ADV_FLAG_PROXY_START); |
290 | 287 | (void)bt_le_ext_adv_stop(ext_adv->instance); |
291 | 288 |
|
292 | 289 | atomic_clear_bit(ext_adv->flags, ADV_FLAG_ACTIVE); |
@@ -326,7 +323,6 @@ static void send_pending_adv(struct k_work *work) |
326 | 323 |
|
327 | 324 | atomic_clear_bit(ext_adv->flags, ADV_FLAG_ACTIVE); |
328 | 325 | atomic_clear_bit(ext_adv->flags, ADV_FLAG_PROXY); |
329 | | - atomic_clear_bit(ext_adv->flags, ADV_FLAG_PROXY_START); |
330 | 326 |
|
331 | 327 | if (ext_adv->adv) { |
332 | 328 | struct bt_mesh_adv_ctx ctx = ext_adv->adv->ctx; |
@@ -371,8 +367,6 @@ static void send_pending_adv(struct k_work *work) |
371 | 367 | return; |
372 | 368 | } |
373 | 369 |
|
374 | | - atomic_set_bit(ext_adv->flags, ADV_FLAG_PROXY_START); |
375 | | - |
376 | 370 | if (!bt_mesh_adv_gatt_send()) { |
377 | 371 | atomic_set_bit(ext_adv->flags, ADV_FLAG_PROXY); |
378 | 372 | } |
@@ -528,7 +522,7 @@ static void connected(struct bt_le_ext_adv *instance, |
528 | 522 | { |
529 | 523 | struct bt_mesh_ext_adv *ext_adv = gatt_adv_get(); |
530 | 524 |
|
531 | | - if (atomic_test_and_clear_bit(ext_adv->flags, ADV_FLAG_PROXY_START)) { |
| 525 | + if (atomic_test_and_clear_bit(ext_adv->flags, ADV_FLAG_PROXY)) { |
532 | 526 | atomic_clear_bit(ext_adv->flags, ADV_FLAG_ACTIVE); |
533 | 527 | (void)schedule_send(ext_adv); |
534 | 528 | } |
|
0 commit comments