Merge tag 'riscv-for-linus-5.14-mw0' of git://git.kernel.org/pub/scm/linux/kernel...

[linux-2.6-microblaze.git] / include / net / bluetooth / hci_core.h

diff --git a/include/net/bluetooth/hci_core.h b/include/net/bluetooth/hci_core.h
index c73ac52..a53e944 100644 (file)
--- a/include/net/bluetooth/hci_core.h
+++ b/include/net/bluetooth/hci_core.h
@@ -122,7 +122,7 @@ struct hci_conn_hash {
        unsigned int     amp_num;
        unsigned int     sco_num;
        unsigned int     le_num;
-       unsigned int     le_num_slave;
+       unsigned int     le_num_peripheral;
 };
 
 struct bdaddr_list {
@@ -228,9 +228,9 @@ struct adv_info {
        __u16   remaining_time;
        __u16   duration;
        __u16   adv_data_len;
-       __u8    adv_data[HCI_MAX_AD_LENGTH];
+       __u8    adv_data[HCI_MAX_EXT_AD_LENGTH];
        __u16   scan_rsp_len;
-       __u8    scan_rsp_data[HCI_MAX_AD_LENGTH];
+       __u8    scan_rsp_data[HCI_MAX_EXT_AD_LENGTH];
        __s8    tx_power;
        __u32   min_interval;
        __u32   max_interval;
@@ -327,7 +327,7 @@ struct hci_dev {
        __u8            max_page;
        __u8            features[HCI_MAX_PAGES][8];
        __u8            le_features[8];
-       __u8            le_white_list_size;
+       __u8            le_accept_list_size;
        __u8            le_resolv_list_size;
        __u8            le_num_of_adv_sets;
        __u8            le_states[8];
@@ -470,6 +470,7 @@ struct hci_dev {
        struct delayed_work     service_cache;
 
        struct delayed_work     cmd_timer;
+       struct delayed_work     ncmd_timer;
 
        struct work_struct      rx_work;
        struct work_struct      cmd_work;
@@ -521,14 +522,14 @@ struct hci_dev {
        struct hci_conn_hash    conn_hash;
 
        struct list_head        mgmt_pending;
-       struct list_head        blacklist;
-       struct list_head        whitelist;
+       struct list_head        reject_list;
+       struct list_head        accept_list;
        struct list_head        uuids;
        struct list_head        link_keys;
        struct list_head        long_term_keys;
        struct list_head        identity_resolving_keys;
        struct list_head        remote_oob_data;
-       struct list_head        le_white_list;
+       struct list_head        le_accept_list;
        struct list_head        le_resolv_list;
        struct list_head        le_conn_params;
        struct list_head        pend_le_conns;
@@ -550,9 +551,9 @@ struct hci_dev {
        DECLARE_BITMAP(dev_flags, __HCI_NUM_FLAGS);
 
        __s8                    adv_tx_power;
-       __u8                    adv_data[HCI_MAX_AD_LENGTH];
+       __u8                    adv_data[HCI_MAX_EXT_AD_LENGTH];
        __u8                    adv_data_len;
-       __u8                    scan_rsp_data[HCI_MAX_AD_LENGTH];
+       __u8                    scan_rsp_data[HCI_MAX_EXT_AD_LENGTH];
        __u8                    scan_rsp_data_len;
 
        struct list_head        adv_instances;
@@ -893,7 +894,7 @@ static inline void hci_conn_hash_add(struct hci_dev *hdev, struct hci_conn *c)
        case LE_LINK:
                h->le_num++;
                if (c->role == HCI_ROLE_SLAVE)
-                       h->le_num_slave++;
+                       h->le_num_peripheral++;
                break;
        case SCO_LINK:
        case ESCO_LINK:
@@ -919,7 +920,7 @@ static inline void hci_conn_hash_del(struct hci_dev *hdev, struct hci_conn *c)
        case LE_LINK:
                h->le_num--;
                if (c->role == HCI_ROLE_SLAVE)
-                       h->le_num_slave--;
+                       h->le_num_peripheral--;
                break;
        case SCO_LINK:
        case ESCO_LINK:
@@ -1393,8 +1394,8 @@ void hci_conn_del_sysfs(struct hci_conn *conn);
 #define lmp_edr_5slot_capable(dev) ((dev)->features[0][5] & LMP_EDR_5SLOT)
 
 /* ----- Extended LMP capabilities ----- */
-#define lmp_csb_master_capable(dev) ((dev)->features[2][0] & LMP_CSB_MASTER)
-#define lmp_csb_slave_capable(dev)  ((dev)->features[2][0] & LMP_CSB_SLAVE)
+#define lmp_cpb_central_capable(dev) ((dev)->features[2][0] & LMP_CPB_CENTRAL)
+#define lmp_cpb_peripheral_capable(dev) ((dev)->features[2][0] & LMP_CPB_PERIPHERAL)
 #define lmp_sync_train_capable(dev) ((dev)->features[2][0] & LMP_SYNC_TRAIN)
 #define lmp_sync_scan_capable(dev)  ((dev)->features[2][0] & LMP_SYNC_SCAN)
 #define lmp_sc_capable(dev)         ((dev)->features[2][1] & LMP_SC)
@@ -1768,7 +1769,7 @@ void __mgmt_power_off(struct hci_dev *hdev);
 void mgmt_new_link_key(struct hci_dev *hdev, struct link_key *key,
                       bool persistent);
 void mgmt_device_connected(struct hci_dev *hdev, struct hci_conn *conn,
-                          u32 flags, u8 *name, u8 name_len);
+                          u8 *name, u8 name_len);
 void mgmt_device_disconnected(struct hci_dev *hdev, bdaddr_t *bdaddr,
                              u8 link_type, u8 addr_type, u8 reason,
                              bool mgmt_connected);