Bluetooth: Introduce LE auto connect options

[pandora-kernel.git] / net / bluetooth / hci_core.c

diff --git a/net/bluetooth/hci_core.c b/net/bluetooth/hci_core.c
index 9a08f34..f4224dc 100644 (file)
--- a/net/bluetooth/hci_core.c
+++ b/net/bluetooth/hci_core.c
@@ -3202,7 +3202,8 @@ struct hci_conn_params *hci_conn_params_lookup(struct hci_dev *hdev,
 
 /* This function requires the caller holds hdev->lock */
 void hci_conn_params_add(struct hci_dev *hdev, bdaddr_t *addr, u8 addr_type,
-                        u16 conn_min_interval, u16 conn_max_interval)
+                        u8 auto_connect, u16 conn_min_interval,
+                        u16 conn_max_interval)
 {
        struct hci_conn_params *params;
 
@@ -3210,6 +3211,7 @@ void hci_conn_params_add(struct hci_dev *hdev, bdaddr_t *addr, u8 addr_type,
        if (params) {
                params->conn_min_interval = conn_min_interval;
                params->conn_max_interval = conn_max_interval;
+               params->auto_connect = auto_connect;
                return;
        }
 
@@ -3223,12 +3225,13 @@ void hci_conn_params_add(struct hci_dev *hdev, bdaddr_t *addr, u8 addr_type,
        params->addr_type = addr_type;
        params->conn_min_interval = conn_min_interval;
        params->conn_max_interval = conn_max_interval;
+       params->auto_connect = auto_connect;
 
        list_add(&params->list, &hdev->le_conn_params);
 
-       BT_DBG("addr %pMR (type %u) conn_min_interval 0x%.4x "
-              "conn_max_interval 0x%.4x", addr, addr_type, conn_min_interval,
-              conn_max_interval);
+       BT_DBG("addr %pMR (type %u) auto_connect %u conn_min_interval 0x%.4x "
+              "conn_max_interval 0x%.4x", addr, addr_type, auto_connect,
+              conn_min_interval, conn_max_interval);
 }
 
 /* This function requires the caller holds hdev->lock */