5 files changed, 64 insertions, 24 deletions

diff --git a/include/linux/ieee802154.h b/include/linux/ieee802154.h
index 40b0ab953937..8872ca103d06 100644
--- a/include/linux/ieee802154.h
+++ b/include/linux/ieee802154.h
@@ -30,6 +30,7 @@
 #define IEEE802154_MTU                  127
 #define IEEE802154_ACK_PSDU_LEN         5
 #define IEEE802154_MIN_PSDU_LEN         9
+#define IEEE802154_FCS_LEN              2
 
 #define IEEE802154_PAN_ID_BROADCAST     0xffff
 #define IEEE802154_ADDR_SHORT_BROADCAST 0xffff
@@ -39,6 +40,7 @@
 
 #define IEEE802154_LIFS_PERIOD          40
 #define IEEE802154_SIFS_PERIOD          12
+#define IEEE802154_MAX_SIFS_FRAME_SIZE  18
 
 #define IEEE802154_MAX_CHANNEL          26
 #define IEEE802154_MAX_PAGE             31
diff --git a/include/net/bluetooth/bluetooth.h b/include/net/bluetooth/bluetooth.h
index 6bb97df16d2d..e598ca096ec9 100644
--- a/include/net/bluetooth/bluetooth.h
+++ b/include/net/bluetooth/bluetooth.h
@@ -354,6 +354,9 @@ void l2cap_exit(void);
 int sco_init(void);
 void sco_exit(void);
 
+int mgmt_init(void);
+void mgmt_exit(void);
+
 void bt_sock_reclassify_lock(struct sock *sk, int proto);
 
 #endif /* __BLUETOOTH_H */
diff --git a/include/net/bluetooth/hci.h b/include/net/bluetooth/hci.h
index 8e54f825153c..d942fedbaedd 100644
--- a/include/net/bluetooth/hci.h
+++ b/include/net/bluetooth/hci.h
@@ -179,15 +179,6 @@ enum {
         HCI_RESET,
 };
 
-/* BR/EDR and/or LE controller flags: the flags defined here should represent
- * states configured via debugfs for debugging and testing purposes only.
- */
-enum {
-        HCI_DUT_MODE,
-        HCI_FORCE_BREDR_SMP,
-        HCI_FORCE_STATIC_ADDR,
-};
-
 /*
  * BR/EDR and/or LE controller flags: the flags defined here should represent
  * states from the controller.
@@ -217,6 +208,7 @@ enum {
         HCI_HS_ENABLED,
         HCI_LE_ENABLED,
         HCI_ADVERTISING,
+        HCI_ADVERTISING_CONNECTABLE,
         HCI_CONNECTABLE,
         HCI_DISCOVERABLE,
         HCI_LIMITED_DISCOVERABLE,
@@ -225,13 +217,13 @@ enum {
         HCI_FAST_CONNECTABLE,
         HCI_BREDR_ENABLED,
         HCI_LE_SCAN_INTERRUPTED,
-};
 
-/* A mask for the flags that are supposed to remain when a reset happens
- * or the HCI device is closed.
- */
-#define HCI_PERSISTENT_MASK (BIT(HCI_LE_SCAN) | BIT(HCI_PERIODIC_INQ) | \
-                              BIT(HCI_FAST_CONNECTABLE) | BIT(HCI_LE_ADV))
+        HCI_DUT_MODE,
+        HCI_FORCE_BREDR_SMP,
+        HCI_FORCE_STATIC_ADDR,
+
+        __HCI_NUM_FLAGS,
+};
 
 /* HCI timeouts */
 #define HCI_DISCONN_TIMEOUT     msecs_to_jiffies(2000)  /* 2 seconds */
diff --git a/include/net/bluetooth/hci_core.h b/include/net/bluetooth/hci_core.h
index acec9140c3f9..6afbf5b014a1 100644
--- a/include/net/bluetooth/hci_core.h
+++ b/include/net/bluetooth/hci_core.h
@@ -76,6 +76,7 @@ struct discovery_state {
         u8                      last_adv_data[HCI_MAX_AD_LENGTH];
         u8                      last_adv_data_len;
         bool                    report_invalid_rssi;
+        bool                    result_filtering;
         s8                      rssi;
         u16                     uuid_count;
         u8                      (*uuids)[16];
@@ -352,8 +353,7 @@ struct hci_dev {
 
         struct rfkill           *rfkill;
 
-        unsigned long           dbg_flags;
-        unsigned long           dev_flags;
+        DECLARE_BITMAP(dev_flags, __HCI_NUM_FLAGS);
 
         struct delayed_work     le_scan_disable;
         struct delayed_work     le_scan_restart;
@@ -501,6 +501,21 @@ extern struct list_head hci_cb_list;
 extern rwlock_t hci_dev_list_lock;
 extern struct mutex hci_cb_list_lock;
 
+#define hci_dev_set_flag(hdev, nr)             set_bit((nr), (hdev)->dev_flags)
+#define hci_dev_clear_flag(hdev, nr)           clear_bit((nr), (hdev)->dev_flags)
+#define hci_dev_change_flag(hdev, nr)          change_bit((nr), (hdev)->dev_flags)
+#define hci_dev_test_flag(hdev, nr)            test_bit((nr), (hdev)->dev_flags)
+#define hci_dev_test_and_set_flag(hdev, nr)    test_and_set_bit((nr), (hdev)->dev_flags)
+#define hci_dev_test_and_clear_flag(hdev, nr)  test_and_clear_bit((nr), (hdev)->dev_flags)
+#define hci_dev_test_and_change_flag(hdev, nr) test_and_change_bit((nr), (hdev)->dev_flags)
+
+#define hci_dev_clear_volatile_flags(hdev)                      \
+        do {                                                    \
+                hci_dev_clear_flag(hdev, HCI_LE_SCAN);          \
+                hci_dev_clear_flag(hdev, HCI_LE_ADV);           \
+                hci_dev_clear_flag(hdev, HCI_PERIODIC_INQ);     \
+        } while (0)
+
 /* ----- HCI interface to upper protocols ----- */
 int l2cap_connect_ind(struct hci_dev *hdev, bdaddr_t *bdaddr);
 int l2cap_disconn_ind(struct hci_conn *hcon);
@@ -525,6 +540,7 @@ static inline void discovery_init(struct hci_dev *hdev)
 
 static inline void hci_discovery_filter_clear(struct hci_dev *hdev)
 {
+        hdev->discovery.result_filtering = false;
         hdev->discovery.report_invalid_rssi = true;
         hdev->discovery.rssi = HCI_RSSI_INVALID;
         hdev->discovery.uuid_count = 0;
@@ -596,14 +612,14 @@ enum {
 static inline bool hci_conn_ssp_enabled(struct hci_conn *conn)
 {
         struct hci_dev *hdev = conn->hdev;
-        return test_bit(HCI_SSP_ENABLED, &hdev->dev_flags) &&
+        return hci_dev_test_flag(hdev, HCI_SSP_ENABLED) &&
                test_bit(HCI_CONN_SSP_ENABLED, &conn->flags);
 }
 
 static inline bool hci_conn_sc_enabled(struct hci_conn *conn)
 {
         struct hci_dev *hdev = conn->hdev;
-        return test_bit(HCI_SC_ENABLED, &hdev->dev_flags) &&
+        return hci_dev_test_flag(hdev, HCI_SC_ENABLED) &&
                test_bit(HCI_CONN_SC_ENABLED, &conn->flags);
 }
 
@@ -965,6 +981,8 @@ struct smp_irk *hci_add_irk(struct hci_dev *hdev, bdaddr_t *bdaddr,
 void hci_remove_irk(struct hci_dev *hdev, bdaddr_t *bdaddr, u8 addr_type);
 void hci_smp_irks_clear(struct hci_dev *hdev);
 
+bool hci_bdaddr_is_paired(struct hci_dev *hdev, bdaddr_t *bdaddr, u8 type);
+
 void hci_remote_oob_data_clear(struct hci_dev *hdev);
 struct oob_data *hci_find_remote_oob_data(struct hci_dev *hdev,
                                           bdaddr_t *bdaddr, u8 bdaddr_type);
@@ -1021,10 +1039,10 @@ void hci_conn_del_sysfs(struct hci_conn *conn);
 #define lmp_host_le_capable(dev)   (!!((dev)->features[1][0] & LMP_HOST_LE))
 #define lmp_host_le_br_capable(dev) (!!((dev)->features[1][0] & LMP_HOST_LE_BREDR))