From 928480ada9b5679ebf1de6ae2624e55c8549cc0a Mon Sep 17 00:00:00 2001
From: lly <lly@espressif.com>
Date: Fri, 6 Dec 2019 15:59:10 +0800
Subject: [PATCH] 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.
---
 components/bt/esp_ble_mesh/mesh_core/net.c    | 10 +--
 .../bt/esp_ble_mesh/mesh_core/transport.c     | 74 +++++++++----------
 2 files changed, 37 insertions(+), 47 deletions(-)

diff --git a/components/bt/esp_ble_mesh/mesh_core/net.c b/components/bt/esp_ble_mesh/mesh_core/net.c
index 640ad61ae..d021d333c 100644
--- a/components/bt/esp_ble_mesh/mesh_core/net.c
+++ b/components/bt/esp_ble_mesh/mesh_core/net.c
@@ -789,12 +789,10 @@ int bt_mesh_net_resend(struct bt_mesh_subnet *sub, struct net_buf *buf,
         return err;
     }
 
-    if (IS_ENABLED(CONFIG_BLE_MESH_NODE) && bt_mesh_is_provisioned()) {
-        if (IS_ENABLED(CONFIG_BLE_MESH_GATT_PROXY_SERVER) &&
-                bt_mesh_proxy_relay(&buf->b, dst)) {
-            send_cb_finalize(cb, cb_data);
-            return 0;
-        }
+    if (IS_ENABLED(CONFIG_BLE_MESH_GATT_PROXY_SERVER) &&
+        bt_mesh_proxy_relay(&buf->b, dst)) {
+        send_cb_finalize(cb, cb_data);
+        return 0;
     }
 
     bt_mesh_adv_send(buf, cb, cb_data);
diff --git a/components/bt/esp_ble_mesh/mesh_core/transport.c b/components/bt/esp_ble_mesh/mesh_core/transport.c
index 2235f7719..5b0a9a968 100644
--- a/components/bt/esp_ble_mesh/mesh_core/transport.c
+++ b/components/bt/esp_ble_mesh/mesh_core/transport.c
@@ -457,11 +457,9 @@ static int send_seg(struct bt_mesh_net_tx *net_tx, struct net_buf_simple *sdu,
         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) &&
-                bt_mesh_lpn_established()) {
-            bt_mesh_lpn_poll();
-        }
+    if (IS_ENABLED(CONFIG_BLE_MESH_LOW_POWER) &&
+        bt_mesh_lpn_established()) {
+        bt_mesh_lpn_poll();
     }
 
     return 0;
@@ -917,32 +915,30 @@ 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 (ctl_op == TRANS_CTL_OP_FRIEND_OFFER) {
-            return bt_mesh_lpn_friend_offer(rx, buf);
-        }
-
-        if (rx->ctx.addr == bt_mesh.lpn.frnd) {
-            if (ctl_op == TRANS_CTL_OP_FRIEND_CLEAR_CFM) {
-                return bt_mesh_lpn_friend_clear_cfm(rx, buf);
-            }
-
-            if (!rx->friend_cred) {
-                BT_WARN("Message from friend with wrong credentials");
-                return -EINVAL;
-            }
-
-            switch (ctl_op) {
-            case TRANS_CTL_OP_FRIEND_UPDATE:
-                return bt_mesh_lpn_friend_update(rx, buf);
-            case TRANS_CTL_OP_FRIEND_SUB_CFM:
-                return bt_mesh_lpn_friend_sub_cfm(rx, buf);
-            }
-        }
-#endif /* CONFIG_BLE_MESH_LOW_POWER */
+    if (ctl_op == TRANS_CTL_OP_FRIEND_OFFER) {
+        return bt_mesh_lpn_friend_offer(rx, buf);
     }
 
+    if (rx->ctx.addr == bt_mesh.lpn.frnd) {
+        if (ctl_op == TRANS_CTL_OP_FRIEND_CLEAR_CFM) {
+            return bt_mesh_lpn_friend_clear_cfm(rx, buf);
+        }
+
+        if (!rx->friend_cred) {
+            BT_WARN("Message from friend with wrong credentials");
+            return -EINVAL;
+        }
+
+        switch (ctl_op) {
+        case TRANS_CTL_OP_FRIEND_UPDATE:
+            return bt_mesh_lpn_friend_update(rx, buf);
+        case TRANS_CTL_OP_FRIEND_SUB_CFM:
+            return bt_mesh_lpn_friend_sub_cfm(rx, buf);
+        }
+    }
+#endif /* CONFIG_BLE_MESH_LOW_POWER */
+
     BT_WARN("Unhandled TransOpCode 0x%02x", ctl_op);
 
     return -ENOENT;
@@ -1477,13 +1473,11 @@ 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
      * 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) &&
-                bt_mesh_lpn_established() && rx->net_if == BLE_MESH_NET_IF_ADV &&
-                (!bt_mesh_lpn_waiting_update() || !rx->friend_cred)) {
-            BT_WARN("Ignoring unexpected message in Low Power mode");
-            return -EAGAIN;
-        }
+    if (IS_ENABLED(CONFIG_BLE_MESH_LOW_POWER) &&
+        bt_mesh_lpn_established() && rx->net_if == BLE_MESH_NET_IF_ADV &&
+        (!bt_mesh_lpn_waiting_update() || !rx->friend_cred)) {
+        BT_WARN("Ignoring unexpected message in Low Power mode");
+        return -EAGAIN;
     }
 
     /* Save the app-level state so the buffer can later be placed in
@@ -1516,12 +1510,10 @@ 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.
      *
      */
-    if (IS_ENABLED(CONFIG_BLE_MESH_NODE) && bt_mesh_is_provisioned()) {
-        if (IS_ENABLED(CONFIG_BLE_MESH_LOW_POWER) &&
-                (bt_mesh_lpn_timer() ||
-                 (bt_mesh_lpn_established() && bt_mesh_lpn_waiting_update()))) {
-            bt_mesh_lpn_msg_received(rx);
-        }
+    if (IS_ENABLED(CONFIG_BLE_MESH_LOW_POWER) &&
+        (bt_mesh_lpn_timer() ||
+        (bt_mesh_lpn_established() && bt_mesh_lpn_waiting_update()))) {
+        bt_mesh_lpn_msg_received(rx);
     }
 
     net_buf_simple_restore(buf, &state);