From 133c7fb17c2736e70072e7d25905e7583dc94224 Mon Sep 17 00:00:00 2001 From: Marcel Holtmann Date: Sun, 9 Mar 2014 11:59:58 -0700 Subject: [PATCH] core: Rename IRK key variable from irk to key --- lib/mgmt.h | 2 +- monitor/control.c | 4 ++-- src/adapter.c | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/lib/mgmt.h b/lib/mgmt.h index e479e3501..6470a9b67 100644 --- a/lib/mgmt.h +++ b/lib/mgmt.h @@ -505,7 +505,7 @@ struct mgmt_ev_passkey_notify { struct mgmt_ev_new_irk { uint8_t store_hint; bdaddr_t rpa; - struct mgmt_irk_info irk; + struct mgmt_irk_info key; } __packed; static const char *mgmt_op[] = { diff --git a/monitor/control.c b/monitor/control.c index 39470df5f..b0bc2c64a 100644 --- a/monitor/control.c +++ b/monitor/control.c @@ -509,9 +509,9 @@ static void mgmt_new_irk(uint16_t len, const void *buf) } ba2str(&ev->rpa, rpa); - ba2str(&ev->irk.addr.bdaddr, addr); + ba2str(&ev->key.addr.bdaddr, addr); - printf("@ New IRK: %s (%d) %s\n", addr, ev->irk.addr.type, rpa); + printf("@ New IRK: %s (%d) %s\n", addr, ev->key.addr.type, rpa); buf += sizeof(*ev); len -= sizeof(*ev); diff --git a/src/adapter.c b/src/adapter.c index 9679d887b..0d514cf5c 100644 --- a/src/adapter.c +++ b/src/adapter.c @@ -5681,8 +5681,8 @@ static void new_irk_callback(uint16_t index, uint16_t length, const void *param, void *user_data) { const struct mgmt_ev_new_irk *ev = param; - const struct mgmt_addr_info *addr = &ev->irk.addr; - const struct mgmt_irk_info *irk = &ev->irk; + const struct mgmt_addr_info *addr = &ev->key.addr; + const struct mgmt_irk_info *irk = &ev->key; struct btd_adapter *adapter = user_data; struct btd_device *device, *duplicate; bool persistent; -- 2.47.3