lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Bluetooth: Remove duplicate definitions for advertising event types

Browse Source 
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>
This commit is contained in:
Marcel Holtmann
2013-10-16 00:16:51 -07:00
committed by Johan Hedberg
parent 5947f4bc42
commit db3aebf4a1
1 changed files with 5 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
include/net/bluetooth/hci.h
View File

@@ -1063,11 +1063,6 @@ struct hci_rp_le_read_local_features {
#define HCI_OP_LE_SET_RANDOM_ADDR 0x2005 #define HCI_OP_LE_SET_RANDOM_ADDR 0x2005
#define LE_ADV_IND 0x00
#define LE_ADV_DIRECT_IND 0x01
#define LE_ADV_SCAN_IND 0x02
#define LE_ADV_NONCONN_IND 0x03
#define HCI_OP_LE_SET_ADV_PARAM 0x2006 #define HCI_OP_LE_SET_ADV_PARAM 0x2006
struct hci_cp_le_set_adv_param { struct hci_cp_le_set_adv_param {
__le16 min_interval; __le16 min_interval;
@@ -1580,11 +1575,11 @@ struct hci_ev_le_ltk_req {
} __packed; } __packed;
/* Advertising report event types */ /* Advertising report event types */
#define ADV_IND 0x00 #define LE_ADV_IND 0x00
#define ADV_DIRECT_IND 0x01 #define LE_ADV_DIRECT_IND 0x01
#define ADV_SCAN_IND 0x02 #define LE_ADV_SCAN_IND 0x02
#define ADV_NONCONN_IND 0x03 #define LE_ADV_NONCONN_IND 0x03
#define ADV_SCAN_RSP 0x04 #define LE_ADV_SCAN_RSP 0x04
#define ADDR_LE_DEV_PUBLIC 0x00 #define ADDR_LE_DEV_PUBLIC 0x00
#define ADDR_LE_DEV_RANDOM 0x01 #define ADDR_LE_DEV_RANDOM 0x01