ble_mesh: Remove useless CONFIG_BLE_MESH_NODE
For Low Power node and Proxy Server, the two features depend on BLE_MESH_NODE in Kconfig.in, here in the stack there is no need to judge if CONFIG_BLE_MESH_NODE is enabled.
This commit is contained in:
parent
da0205b166
commit
928480ada9
|
@ -789,13 +789,11 @@ int bt_mesh_net_resend(struct bt_mesh_subnet *sub, struct net_buf *buf,
|
||||||
return err;
|
return err;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (IS_ENABLED(CONFIG_BLE_MESH_NODE) && bt_mesh_is_provisioned()) {
|
|
||||||
if (IS_ENABLED(CONFIG_BLE_MESH_GATT_PROXY_SERVER) &&
|
if (IS_ENABLED(CONFIG_BLE_MESH_GATT_PROXY_SERVER) &&
|
||||||
bt_mesh_proxy_relay(&buf->b, dst)) {
|
bt_mesh_proxy_relay(&buf->b, dst)) {
|
||||||
send_cb_finalize(cb, cb_data);
|
send_cb_finalize(cb, cb_data);
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
}
|
|
||||||
|
|
||||||
bt_mesh_adv_send(buf, cb, cb_data);
|
bt_mesh_adv_send(buf, cb, cb_data);
|
||||||
return 0;
|
return 0;
|
||||||
|
|
|
@ -457,12 +457,10 @@ static int send_seg(struct bt_mesh_net_tx *net_tx, struct net_buf_simple *sdu,
|
||||||
send_cb_finalize(cb, cb_data);
|
send_cb_finalize(cb, cb_data);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (IS_ENABLED(CONFIG_BLE_MESH_NODE) && bt_mesh_is_provisioned()) {
|
|
||||||
if (IS_ENABLED(CONFIG_BLE_MESH_LOW_POWER) &&
|
if (IS_ENABLED(CONFIG_BLE_MESH_LOW_POWER) &&
|
||||||
bt_mesh_lpn_established()) {
|
bt_mesh_lpn_established()) {
|
||||||
bt_mesh_lpn_poll();
|
bt_mesh_lpn_poll();
|
||||||
}
|
}
|
||||||
}
|
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
@ -917,7 +915,6 @@ static int ctl_recv(struct bt_mesh_net_rx *rx, u8_t hdr,
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (IS_ENABLED(CONFIG_BLE_MESH_NODE) && bt_mesh_is_provisioned()) {
|
|
||||||
#if defined(CONFIG_BLE_MESH_LOW_POWER)
|
#if defined(CONFIG_BLE_MESH_LOW_POWER)
|
||||||
if (ctl_op == TRANS_CTL_OP_FRIEND_OFFER) {
|
if (ctl_op == TRANS_CTL_OP_FRIEND_OFFER) {
|
||||||
return bt_mesh_lpn_friend_offer(rx, buf);
|
return bt_mesh_lpn_friend_offer(rx, buf);
|
||||||
|
@ -941,7 +938,6 @@ static int ctl_recv(struct bt_mesh_net_rx *rx, u8_t hdr,
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
#endif /* CONFIG_BLE_MESH_LOW_POWER */
|
#endif /* CONFIG_BLE_MESH_LOW_POWER */
|
||||||
}
|
|
||||||
|
|
||||||
BT_WARN("Unhandled TransOpCode 0x%02x", ctl_op);
|
BT_WARN("Unhandled TransOpCode 0x%02x", ctl_op);
|
||||||
|
|
||||||
|
@ -1477,14 +1473,12 @@ int bt_mesh_trans_recv(struct net_buf_simple *buf, struct bt_mesh_net_rx *rx)
|
||||||
* requested the Friend to send them. The messages must also
|
* requested the Friend to send them. The messages must also
|
||||||
* be encrypted using the Friend Credentials.
|
* be encrypted using the Friend Credentials.
|
||||||
*/
|
*/
|
||||||
if (IS_ENABLED(CONFIG_BLE_MESH_NODE) && bt_mesh_is_provisioned()) {
|
|
||||||
if (IS_ENABLED(CONFIG_BLE_MESH_LOW_POWER) &&
|
if (IS_ENABLED(CONFIG_BLE_MESH_LOW_POWER) &&
|
||||||
bt_mesh_lpn_established() && rx->net_if == BLE_MESH_NET_IF_ADV &&
|
bt_mesh_lpn_established() && rx->net_if == BLE_MESH_NET_IF_ADV &&
|
||||||
(!bt_mesh_lpn_waiting_update() || !rx->friend_cred)) {
|
(!bt_mesh_lpn_waiting_update() || !rx->friend_cred)) {
|
||||||
BT_WARN("Ignoring unexpected message in Low Power mode");
|
BT_WARN("Ignoring unexpected message in Low Power mode");
|
||||||
return -EAGAIN;
|
return -EAGAIN;
|
||||||
}
|
}
|
||||||
}
|
|
||||||
|
|
||||||
/* Save the app-level state so the buffer can later be placed in
|
/* Save the app-level state so the buffer can later be placed in
|
||||||
* the Friend Queue.
|
* the Friend Queue.
|
||||||
|
@ -1516,13 +1510,11 @@ int bt_mesh_trans_recv(struct net_buf_simple *buf, struct bt_mesh_net_rx *rx)
|
||||||
* timer, in which case we want to reset the timer at this point.
|
* timer, in which case we want to reset the timer at this point.
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
if (IS_ENABLED(CONFIG_BLE_MESH_NODE) && bt_mesh_is_provisioned()) {
|
|
||||||
if (IS_ENABLED(CONFIG_BLE_MESH_LOW_POWER) &&
|
if (IS_ENABLED(CONFIG_BLE_MESH_LOW_POWER) &&
|
||||||
(bt_mesh_lpn_timer() ||
|
(bt_mesh_lpn_timer() ||
|
||||||
(bt_mesh_lpn_established() && bt_mesh_lpn_waiting_update()))) {
|
(bt_mesh_lpn_established() && bt_mesh_lpn_waiting_update()))) {
|
||||||
bt_mesh_lpn_msg_received(rx);
|
bt_mesh_lpn_msg_received(rx);
|
||||||
}
|
}
|
||||||
}
|
|
||||||
|
|
||||||
net_buf_simple_restore(buf, &state);
|
net_buf_simple_restore(buf, &state);
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue