linux-bluetooth.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH] Bluetooth: Remove MGMT_ADDR_INVALID macro
@ 2012-03-30 23:05 Andre Guedes
  2012-03-31  4:39 ` Marcel Holtmann
  0 siblings, 1 reply; 8+ messages in thread
From: Andre Guedes @ 2012-03-30 23:05 UTC (permalink / raw)
  To: linux-bluetooth

This patch removes the MGMT_ADDR_INVALID macro. If the address type
isn't LE, we consider it is BR/EDR type.

Signed-off-by: Andre Guedes <andre.guedes@openbossa.org>
---
 include/net/bluetooth/hci_core.h |    1 -
 net/bluetooth/mgmt.c             |   19 +++++--------------
 2 files changed, 5 insertions(+), 15 deletions(-)

diff --git a/include/net/bluetooth/hci_core.h b/include/net/bluetooth/hci_core.h
index c8d5beb..c0b232c 100644
--- a/include/net/bluetooth/hci_core.h
+++ b/include/net/bluetooth/hci_core.h
@@ -967,7 +967,6 @@ void hci_sock_dev_event(struct hci_dev *hdev, int event);
 #define MGMT_ADDR_BREDR			0x00
 #define MGMT_ADDR_LE_PUBLIC		0x01
 #define MGMT_ADDR_LE_RANDOM		0x02
-#define MGMT_ADDR_INVALID		0xff
 
 #define DISCOV_TYPE_BREDR		(BIT(MGMT_ADDR_BREDR))
 #define DISCOV_TYPE_LE			(BIT(MGMT_ADDR_LE_PUBLIC) | \
diff --git a/net/bluetooth/mgmt.c b/net/bluetooth/mgmt.c
index b4f7e32..c13ea5f 100644
--- a/net/bluetooth/mgmt.c
+++ b/net/bluetooth/mgmt.c
@@ -1635,20 +1635,13 @@ failed:
 
 static u8 link_to_mgmt(u8 link_type, u8 addr_type)
 {
-	switch (link_type) {
-	case LE_LINK:
-		switch (addr_type) {
-		case ADDR_LE_DEV_PUBLIC:
-			return MGMT_ADDR_LE_PUBLIC;
-		case ADDR_LE_DEV_RANDOM:
+	if (link_type == LE_LINK) {
+		if (addr_type == ADDR_LE_DEV_RANDOM)
 			return MGMT_ADDR_LE_RANDOM;
-		default:
-			return MGMT_ADDR_INVALID;
-		}
-	case ACL_LINK:
+		else
+			return MGMT_ADDR_LE_PUBLIC;
+	} else {
 		return MGMT_ADDR_BREDR;
-	default:
-		return MGMT_ADDR_INVALID;
 	}
 }
 
@@ -1690,8 +1683,6 @@ static int get_connections(struct sock *sk, struct hci_dev *hdev, void *data,
 			continue;
 		bacpy(&rp->addr[i].bdaddr, &c->dst);
 		rp->addr[i].type = link_to_mgmt(c->type, c->dst_type);
-		if (rp->addr[i].type == MGMT_ADDR_INVALID)
-			continue;
 		i++;
 	}
 
-- 
1.7.9.4


^ permalink raw reply related	[flat|nested] 8+ messages in thread

end of thread, other threads:[~2012-04-05  8:52 UTC | newest]

Thread overview: 8+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-03-30 23:05 [PATCH] Bluetooth: Remove MGMT_ADDR_INVALID macro Andre Guedes
2012-03-31  4:39 ` Marcel Holtmann
2012-04-02 13:14   ` Andre Guedes
2012-04-02 17:40     ` Andre Guedes
2012-04-02 18:51       ` Johan Hedberg
2012-04-03 11:43         ` Andre Guedes
2012-04-03 11:46           ` Andre Guedes
2012-04-05  8:52             ` Johan Hedberg

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).