Bluetooth: Mesh: Add error code for bt_mesh_adv_terminate (fcfc99a2) · Commits · Wenxi XU / zephyr

subsys/bluetooth/mesh/adv.h

+1 −1

Original line number	Diff line number	Diff line
		@@ -101,7 +101,7 @@ void bt_mesh_adv_local_ready(void);

		void bt_mesh_adv_relay_ready(void);

		void bt_mesh_adv_terminate(struct bt_mesh_adv *adv);
		int bt_mesh_adv_terminate(struct bt_mesh_adv *adv);

		void bt_mesh_adv_friend_ready(void);

+6 −4

Original line number	Diff line number	Diff line
		@@ -370,7 +370,7 @@ void bt_mesh_adv_friend_ready(void)
		}
		}

		void bt_mesh_adv_terminate(struct bt_mesh_adv *adv)
		int bt_mesh_adv_terminate(struct bt_mesh_adv *adv)
		{
		int err;

		@@ -382,13 +382,13 @@ void bt_mesh_adv_terminate(struct bt_mesh_adv *adv)
		}

		if (!atomic_test_bit(ext_adv->flags, ADV_FLAG_ACTIVE)) {
		return;
		return 0;
		}

		err = bt_le_ext_adv_stop(ext_adv->instance);
		if (err) {
		LOG_ERR("Failed to stop adv %d", err);
		return;
		return err;
		}

		/* Do not call `cb:end`, since this user action */
		@@ -398,8 +398,10 @@ void bt_mesh_adv_terminate(struct bt_mesh_adv *adv)

		k_work_submit(&ext_adv->work);

		return;
		return 0;
		}

		return -EINVAL;
		}

		void bt_mesh_adv_init(void)

+3 −1

Original line number	Diff line number	Diff line
		@@ -214,9 +214,11 @@ void bt_mesh_adv_gatt_update(void)
		bt_mesh_adv_get_cancel();
		}

		void bt_mesh_adv_terminate(struct bt_mesh_adv *adv)
		int bt_mesh_adv_terminate(struct bt_mesh_adv *adv)
		{
		ARG_UNUSED(adv);

		return 0;
		}

		void bt_mesh_adv_init(void)