Bluetooth: Remove not needed src from bt_conn

Since initiator and responder addresses are already tracked it is
no longer needed to store source address in bt_conn structure.

Change-Id: I048e4d4659f4b7d29b101f9f3c5708f66c773906
Signed-off-by: Szymon Janc <ext.szymon.janc@tieto.com>
This commit is contained in:
Szymon Janc 2015-09-02 12:35:53 +02:00 committed by Anas Nashif
commit 81c445c02e
2 changed files with 6 additions and 5 deletions

View file

@ -58,7 +58,6 @@ struct bt_conn {
uint8_t role;
atomic_t flags[1];
bt_addr_le_t src;
bt_addr_le_t dst;
bt_addr_le_t init_addr;

View file

@ -758,6 +758,7 @@ static void le_conn_complete(struct bt_buf *buf)
uint16_t handle = sys_le16_to_cpu(evt->handle);
struct bt_conn *conn;
struct bt_keys *keys;
bt_addr_le_t src;
int err;
BT_DBG("status %u handle %u role %u %s\n", evt->status, handle,
@ -799,17 +800,18 @@ static void le_conn_complete(struct bt_buf *buf)
}
conn->handle = handle;
conn->src.type = BT_ADDR_LE_PUBLIC;
memcpy(conn->src.val, bt_dev.bdaddr.val, sizeof(bt_dev.bdaddr.val));
copy_id_addr(conn, &evt->peer_addr);
conn->le_conn_interval = sys_le16_to_cpu(evt->interval);
src.type = BT_ADDR_LE_PUBLIC;
memcpy(src.val, bt_dev.bdaddr.val, sizeof(bt_dev.bdaddr.val));
if (conn->role == BT_HCI_ROLE_MASTER) {
bt_addr_le_copy(&conn->init_addr, &conn->src);
bt_addr_le_copy(&conn->init_addr, &src);
bt_addr_le_copy(&conn->resp_addr, &evt->peer_addr);
} else {
bt_addr_le_copy(&conn->init_addr, &evt->peer_addr);
bt_addr_le_copy(&conn->resp_addr, &conn->src);
bt_addr_le_copy(&conn->resp_addr, &src);
}
bt_conn_set_state(conn, BT_CONN_CONNECTED);