[PATCH v3 11/18] eir: Remove support for creating EIR with tx_power fields
From: Szymon Janc <hidden>
Date: 2012-09-21 12:36:28
Subsystem:
the rest · Maintainer:
Linus Torvalds
This field is not used for OOB EIR. --- src/eir.c | 9 +-------- src/eir.h | 2 +- 2 files changed, 2 insertions(+), 9 deletions(-)
diff --git a/src/eir.c b/src/eir.c
index a3c99e8..c67cf6f 100644
--- a/src/eir.c
+++ b/src/eir.c@@ -280,7 +280,7 @@ static void eir_generate_uuid128(GSList *list, uint8_t *ptr, uint16_t *eir_len) } } -void eir_create_oob(const char *name, int8_t tx_power, uint32_t cod, +void eir_create_oob(const char *name, uint32_t cod, uint8_t *hash, uint8_t *randomizer, uint16_t did_vendor, uint16_t did_product, uint16_t did_version, uint16_t did_source,
@@ -349,13 +349,6 @@ void eir_create_oob(const char *name, int8_t tx_power, uint32_t cod, ptr += (name_len + 2); } - if (tx_power != 0) { - *ptr++ = 2; - *ptr++ = EIR_TX_POWER; - *ptr++ = (uint8_t) tx_power; - eir_len += 3; - } - if (did_vendor != 0x0000) { *ptr++ = 9; *ptr++ = EIR_DEVICE_ID;
diff --git a/src/eir.h b/src/eir.h
index 55289f9..d5c4afc 100644
--- a/src/eir.h
+++ b/src/eir.h@@ -58,7 +58,7 @@ struct eir_data { void eir_data_free(struct eir_data *eir); int eir_parse(struct eir_data *eir, uint8_t *eir_data, uint8_t eir_len); int eir_parse_oob(struct eir_data *eir, uint8_t *eir_data, uint16_t eir_len); -void eir_create_oob(const char *name, int8_t tx_power, uint32_t cod, +void eir_create_oob(const char *name, uint32_t cod, uint8_t *hash, uint8_t *randomizer, uint16_t did_vendor, uint16_t did_product, uint16_t did_version, uint16_t did_source,
--
1.7.9.5