diff options
author | Marcel Holtmann <marcel@holtmann.org> | 2013-10-16 03:16:51 -0400 |
---|---|---|
committer | Johan Hedberg <johan.hedberg@intel.com> | 2013-10-16 03:31:48 -0400 |
commit | db3aebf4a13562c60761e5530f2cbf6ef9fdee2b (patch) | |
tree | c7d39f6060cbe3fb5263c6df5fab5438707d54aa | |
parent | 5947f4bc4253df3a18a540af096463530c5f8737 (diff) |
Bluetooth: Remove duplicate definitions for advertising event types
The constants for advertising event types have been defined twice. So
remove one copy of it.
Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
Signed-off-by: Johan Hedberg <johan.hedberg@intel.com>
-rw-r--r-- | include/net/bluetooth/hci.h | 15 |
1 files changed, 5 insertions, 10 deletions
diff --git a/include/net/bluetooth/hci.h b/include/net/bluetooth/hci.h index aca8944b3e30..c8bc7bfffaf5 100644 --- a/include/net/bluetooth/hci.h +++ b/include/net/bluetooth/hci.h | |||
@@ -1063,11 +1063,6 @@ struct hci_rp_le_read_local_features { | |||
1063 | 1063 | ||
1064 | #define HCI_OP_LE_SET_RANDOM_ADDR 0x2005 | 1064 | #define HCI_OP_LE_SET_RANDOM_ADDR 0x2005 |
1065 | 1065 | ||
1066 | #define LE_ADV_IND 0x00 | ||
1067 | #define LE_ADV_DIRECT_IND 0x01 | ||
1068 | #define LE_ADV_SCAN_IND 0x02 | ||
1069 | #define LE_ADV_NONCONN_IND 0x03 | ||
1070 | |||
1071 | #define HCI_OP_LE_SET_ADV_PARAM 0x2006 | 1066 | #define HCI_OP_LE_SET_ADV_PARAM 0x2006 |
1072 | struct hci_cp_le_set_adv_param { | 1067 | struct hci_cp_le_set_adv_param { |
1073 | __le16 min_interval; | 1068 | __le16 min_interval; |
@@ -1580,11 +1575,11 @@ struct hci_ev_le_ltk_req { | |||
1580 | } __packed; | 1575 | } __packed; |
1581 | 1576 | ||
1582 | /* Advertising report event types */ | 1577 | /* Advertising report event types */ |
1583 | #define ADV_IND 0x00 | 1578 | #define LE_ADV_IND 0x00 |
1584 | #define ADV_DIRECT_IND 0x01 | 1579 | #define LE_ADV_DIRECT_IND 0x01 |
1585 | #define ADV_SCAN_IND 0x02 | 1580 | #define LE_ADV_SCAN_IND 0x02 |
1586 | #define ADV_NONCONN_IND 0x03 | 1581 | #define LE_ADV_NONCONN_IND 0x03 |
1587 | #define ADV_SCAN_RSP 0x04 | 1582 | #define LE_ADV_SCAN_RSP 0x04 |
1588 | 1583 | ||
1589 | #define ADDR_LE_DEV_PUBLIC 0x00 | 1584 | #define ADDR_LE_DEV_PUBLIC 0x00 |
1590 | #define ADDR_LE_DEV_RANDOM 0x01 | 1585 | #define ADDR_LE_DEV_RANDOM 0x01 |