From: Szymon Janc <szymon.janc@tieto.com>
Date: Wed, 3 Oct 2012 13:18:21 +0000 (+0200)
Subject: eir: Remove support for creating EIR with tx_power fields
X-Git-Tag: android-x86-4.4-r3~12584
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=b0f95f503f540599315815ade33ae755388c7612;p=android-x86%2Fexternal-bluetooth-bluez.git

eir: Remove support for creating EIR with tx_power fields

This field is not used for OOB EIR.
---

diff --git a/src/eir.c b/src/eir.c
index f291bc5f1..ac9d13f12 100644
--- a/src/eir.c
+++ b/src/eir.c
@@ -278,7 +278,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,
@@ -347,13 +347,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 55289f94a..d5c4afcb6 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,