Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/padovan/bluetooth-next-2.6

Conflicts:
	net/bluetooth/l2cap_core.c

6 files changed, 75 insertions, 12 deletions

diff --git a/include/net/bluetooth/bluetooth.h b/include/net/bluetooth/bluetooth.h
index 7bccaf921cab..e727555d4ee9 100644
--- a/include/net/bluetooth/bluetooth.h
+++ b/include/net/bluetooth/bluetooth.h
@@ -56,6 +56,7 @@
 #define BT_SECURITY     4
 struct bt_security {
         __u8 level;
+        __u8 key_size;
 };
 #define BT_SECURITY_SDP         0
 #define BT_SECURITY_LOW         1
@@ -76,9 +77,12 @@ struct bt_power {
 #define BT_POWER_FORCE_ACTIVE_OFF 0
 #define BT_POWER_FORCE_ACTIVE_ON  1
 
-#define BT_INFO(fmt, arg...) printk(KERN_INFO "Bluetooth: " fmt "\n" , ## arg)
-#define BT_ERR(fmt, arg...)  printk(KERN_ERR "%s: " fmt "\n" , __func__ , ## arg)
-#define BT_DBG(fmt, arg...)  pr_debug("%s: " fmt "\n" , __func__ , ## arg)
+__attribute__((format (printf, 2, 3)))
+int bt_printk(const char *level, const char *fmt, ...);
+
+#define BT_INFO(fmt, arg...)   bt_printk(KERN_INFO, pr_fmt(fmt), ##arg)
+#define BT_ERR(fmt, arg...)    bt_printk(KERN_ERR, pr_fmt(fmt), ##arg)
+#define BT_DBG(fmt, arg...)    pr_debug(fmt "\n", ##arg)
 
 /* Connection and socket states */
 enum {
@@ -204,7 +208,7 @@ out:
         return NULL;
 }
 
-int bt_err(__u16 code);
+int bt_to_errno(__u16 code);
 
 extern int hci_sock_init(void);
 extern void hci_sock_cleanup(void);
diff --git a/include/net/bluetooth/hci.h b/include/net/bluetooth/hci.h
index 65345cd215be..be30aabe7b88 100644
--- a/include/net/bluetooth/hci.h
+++ b/include/net/bluetooth/hci.h
@@ -211,11 +211,16 @@ enum {
 #define LMP_EDR_3S_ESCO 0x80
 
 #define LMP_EXT_INQ     0x01
+#define LMP_SIMUL_LE_BR 0x02
 #define LMP_SIMPLE_PAIR 0x08
 #define LMP_NO_FLUSH    0x40
 
 #define LMP_LSTO        0x01
 #define LMP_INQ_TX_PWR  0x02
+#define LMP_EXTFEATURES 0x80
+
+/* Extended LMP features */
+#define LMP_HOST_LE     0x02
 
 /* Connection modes */
 #define HCI_CM_ACTIVE   0x0000
@@ -254,6 +259,10 @@ enum {
 #define HCI_LK_UNAUTH_COMBINATION       0x04
 #define HCI_LK_AUTH_COMBINATION         0x05
 #define HCI_LK_CHANGED_COMBINATION      0x06
+/* The spec doesn't define types for SMP keys */
+#define HCI_LK_SMP_LTK                  0x81
+#define HCI_LK_SMP_IRK                  0x82
+#define HCI_LK_SMP_CSRK                 0x83
 
 /* -----  HCI Commands ---- */
 #define HCI_OP_NOP                      0x0000
@@ -653,6 +662,12 @@ struct hci_rp_read_local_oob_data {
 
 #define HCI_OP_READ_INQ_RSP_TX_POWER    0x0c58
 
+#define HCI_OP_WRITE_LE_HOST_SUPPORTED  0x0c6d
+struct hci_cp_write_le_host_supported {
+        __u8 le;
+        __u8 simul;
+} __packed;
+
 #define HCI_OP_READ_LOCAL_VERSION       0x1001
 struct hci_rp_read_local_version {
         __u8     status;
@@ -676,6 +691,9 @@ struct hci_rp_read_local_features {
 } __packed;
 
 #define HCI_OP_READ_LOCAL_EXT_FEATURES  0x1004
+struct hci_cp_read_local_ext_features {
+        __u8     page;
+} __packed;
 struct hci_rp_read_local_ext_features {
         __u8     status;
         __u8     page;
diff --git a/include/net/bluetooth/hci_core.h b/include/net/bluetooth/hci_core.h
index 26233d4d371c..c41e275917c7 100644
--- a/include/net/bluetooth/hci_core.h
+++ b/include/net/bluetooth/hci_core.h
@@ -74,12 +74,28 @@ struct bt_uuid {
         u8 svc_hint;
 };
 
+struct key_master_id {
+        __le16 ediv;
+        u8 rand[8];
+} __packed;
+
+struct link_key_data {
+        bdaddr_t bdaddr;
+        u8 type;
+        u8 val[16];
+        u8 pin_len;
+        u8 dlen;
+        u8 data[0];
+} __packed;
+
 struct link_key {
         struct list_head list;
         bdaddr_t bdaddr;
         u8 type;
         u8 val[16];
         u8 pin_len;
+        u8 dlen;
+        u8 data[0];
 };
 
 struct oob_data {
@@ -113,6 +129,7 @@ struct hci_dev {
         __u8            major_class;
         __u8            minor_class;
         __u8            features[8];
+        __u8            extfeatures[8];
         __u8            commands[64];
         __u8            ssp_mode;
         __u8            hci_ver;
@@ -223,7 +240,6 @@ struct hci_conn {
         struct list_head list;
 
         atomic_t        refcnt;
-        spinlock_t      lock;
 
         bdaddr_t        dst;
         __u8            dst_type;
@@ -245,11 +261,11 @@ struct hci_conn {
         __u8            sec_level;
         __u8            pending_sec_level;
         __u8            pin_length;
+        __u8            enc_key_size;
         __u8            io_capability;
         __u8            power_save;
         __u16           disc_timeout;
         unsigned long   pend;
-        __u8            ltk[16];
 
         __u8            remote_cap;
         __u8            remote_oob;
@@ -272,7 +288,6 @@ struct hci_conn {
         struct hci_dev  *hdev;
         void            *l2cap_data;
         void            *sco_data;
-        void            *priv;
 
         struct hci_conn *link;
 
@@ -538,6 +553,11 @@ int hci_link_keys_clear(struct hci_dev *hdev);
 struct link_key *hci_find_link_key(struct hci_dev *hdev, bdaddr_t *bdaddr);
 int hci_add_link_key(struct hci_dev *hdev, struct hci_conn *conn, int new_key,
                         bdaddr_t *bdaddr, u8 *val, u8 type, u8 pin_len);
+struct link_key *hci_find_ltk(struct hci_dev *hdev, __le16 ediv, u8 rand[8]);
+struct link_key *hci_find_link_key_type(struct hci_dev *hdev,
+                                        bdaddr_t *bdaddr, u8 type);
+int hci_add_ltk(struct hci_dev *hdev, int new_key, bdaddr_t *bdaddr,
+                        u8 key_size, __le16 ediv, u8 rand[8], u8 ltk[16]);
 int hci_remove_link_key(struct hci_dev *hdev, bdaddr_t *bdaddr);
 
 int hci_remote_oob_data_clear(struct hci_dev *hdev);
@@ -579,6 +599,9 @@ void hci_conn_del_sysfs(struct hci_conn *conn);
 #define lmp_no_flush_capable(dev)  ((dev)->features[6] & LMP_NO_FLUSH)
 #define lmp_le_capable(dev)        ((dev)->features[4] & LMP_LE)
 
+/* ----- Extended LMP capabilities ----- */
+#define lmp_host_le_capable(dev)   ((dev)->extfeatures[0] & LMP_HOST_LE)
+
 /* ----- HCI protocols ----- */
 struct hci_proto {
         char            *name;
diff --git a/include/net/bluetooth/l2cap.h b/include/net/bluetooth/l2cap.h
index 9c18e555b6ed..4f34ad25e75c 100644
--- a/include/net/bluetooth/l2cap.h
+++ b/include/net/bluetooth/l2cap.h
@@ -37,7 +37,6 @@
 #define L2CAP_DEFAULT_MONITOR_TO        12000   /* 12 seconds */
 #define L2CAP_DEFAULT_MAX_PDU_SIZE      1009    /* Sized for 3-DH5 packet */
 #define L2CAP_DEFAULT_ACK_TO            200
-#define L2CAP_LOCAL_BUSY_TRIES          12
 #define L2CAP_LE_DEFAULT_MTU            23
 
 #define L2CAP_CONN_TIMEOUT      (40000) /* 40 seconds */
@@ -130,6 +129,12 @@ struct l2cap_conninfo {
 #define L2CAP_SDU_END               0x8000
 #define L2CAP_SDU_CONTINUE          0xC000
 
+/* L2CAP Command rej. reasons */
+#define L2CAP_REJ_NOT_UNDERSTOOD      0x0000
+#define L2CAP_REJ_MTU_EXCEEDED        0x0001
+#define L2CAP_REJ_INVALID_CID         0x0002
+
+
 /* L2CAP structures */
 struct l2cap_hdr {
         __le16     len;
@@ -144,8 +149,19 @@ struct l2cap_cmd_hdr {
 } __packed;
 #define L2CAP_CMD_HDR_SIZE      4
 
-struct l2cap_cmd_rej {
+struct l2cap_cmd_rej_unk {
+        __le16     reason;
+} __packed;
+
+struct l2cap_cmd_rej_mtu {
         __le16     reason;
+        __le16     max_mtu;
+} __packed;
+
+struct l2cap_cmd_rej_cid {
+        __le16     reason;
+        __le16     scid;
+        __le16     dcid;
 } __packed;
 
 struct l2cap_conn_req {
@@ -352,8 +368,6 @@ struct l2cap_chan {
         struct sk_buff          *tx_send_head;
         struct sk_buff_head     tx_q;
         struct sk_buff_head     srej_q;
-        struct sk_buff_head     busy_q;
-        struct work_struct      busy_work;
         struct list_head        srej_l;
 
         struct list_head list;
@@ -422,6 +436,7 @@ struct l2cap_conn {
 struct l2cap_pinfo {
         struct bt_sock  bt;
         struct l2cap_chan       *chan;
+        struct sk_buff  *rx_busy_skb;
 };
 
 enum {
@@ -449,7 +464,6 @@ enum {
         CONN_REJ_ACT,
         CONN_SEND_FBIT,
         CONN_RNR_SENT,
-        CONN_SAR_RETRY,
 };
 
 #define __set_chan_timer(c, t) l2cap_set_timer(c, &c->chan_timer, (t))
@@ -498,5 +512,6 @@ void l2cap_chan_close(struct l2cap_chan *chan, int reason);
 void l2cap_chan_destroy(struct l2cap_chan *chan);
 int l2cap_chan_connect(struct l2cap_chan *chan);
 int l2cap_chan_send(struct l2cap_chan *chan, struct msghdr *msg, size_t len);
+void l2cap_chan_busy(struct l2cap_chan *chan, int busy);
 
 #endif /* __L2CAP_H */
diff --git a/include/net/bluetooth/mgmt.h b/include/net/bluetooth/mgmt.h
index 45bea25d737f..5428fd32ccec 100644
--- a/include/net/bluetooth/mgmt.h
+++ b/include/net/bluetooth/mgmt.h
@@ -101,6 +101,8 @@ struct mgmt_key_info {
         u8 type;
         u8 val[16];
         u8 pin_len;
+        u8 dlen;
+        u8 data[0];
 } __packed;
 
 #define MGMT_OP_LOAD_KEYS               0x000D
diff --git a/include/net/bluetooth/smp.h b/include/net/bluetooth/smp.h
index 4fb7d198a876..46c457612300 100644
--- a/include/net/bluetooth/smp.h
+++ b/include/net/bluetooth/smp.h
@@ -118,5 +118,6 @@ struct smp_cmd_security_req {
 /* SMP Commands */
 int smp_conn_security(struct l2cap_conn *conn, __u8 sec_level);
 int smp_sig_channel(struct l2cap_conn *conn, struct sk_buff *skb);
+int smp_distribute_keys(struct l2cap_conn *conn, __u8 force);
 
 #endif /* __SMP_H */