Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6 into for-davem

Conflicts:
	net/bluetooth/Makefile

4 files changed, 100 insertions, 1 deletions

diff --git a/include/net/bluetooth/bluetooth.h b/include/net/bluetooth/bluetooth.h
index d81ea7997701..0c5e72503b77 100644
--- a/include/net/bluetooth/bluetooth.h
+++ b/include/net/bluetooth/bluetooth.h
@@ -144,6 +144,7 @@ struct bt_skb_cb {
         __u8 tx_seq;
         __u8 retries;
         __u8 sar;
+        unsigned short channel;
 };
 #define bt_cb(skb) ((struct bt_skb_cb *)((skb)->cb))
 
diff --git a/include/net/bluetooth/hci.h b/include/net/bluetooth/hci.h
index f3c5ed6d7bda..29a7a8ca0438 100644
--- a/include/net/bluetooth/hci.h
+++ b/include/net/bluetooth/hci.h
@@ -934,9 +934,13 @@ static inline struct hci_sco_hdr *hci_sco_hdr(const struct sk_buff *skb)
 struct sockaddr_hci {
         sa_family_t    hci_family;
         unsigned short hci_dev;
+        unsigned short hci_channel;
 };
 #define HCI_DEV_NONE    0xffff
 
+#define HCI_CHANNEL_RAW         0
+#define HCI_CHANNEL_CONTROL     1
+
 struct hci_filter {
         unsigned long type_mask;
         unsigned long event_mask[2];
diff --git a/include/net/bluetooth/hci_core.h b/include/net/bluetooth/hci_core.h
index 9c08625617a1..a29feb01854e 100644
--- a/include/net/bluetooth/hci_core.h
+++ b/include/net/bluetooth/hci_core.h
@@ -129,6 +129,7 @@ struct hci_dev {
         wait_queue_head_t       req_wait_q;
         __u32                   req_status;
         __u32                   req_result;
+        __u16                   req_last_cmd;
 
         struct inquiry_cache    inq_cache;
         struct hci_conn_hash    conn_hash;
@@ -660,6 +661,11 @@ void hci_si_event(struct hci_dev *hdev, int type, int dlen, void *data);
 /* ----- HCI Sockets ----- */
 void hci_send_to_sock(struct hci_dev *hdev, struct sk_buff *skb);
 
+/* Management interface */
+int mgmt_control(struct sock *sk, struct msghdr *msg, size_t len);
+int mgmt_index_added(u16 index);
+int mgmt_index_removed(u16 index);
+
 /* HCI info for socket */
 #define hci_pi(sk) ((struct hci_pinfo *) sk)
 
@@ -668,6 +674,7 @@ struct hci_pinfo {
         struct hci_dev    *hdev;
         struct hci_filter filter;
         __u32             cmsg_mask;
+        unsigned short   channel;
 };
 
 /* HCI security filter */
@@ -687,6 +694,6 @@ struct hci_sec_filter {
 #define hci_req_lock(d)         mutex_lock(&d->req_lock)
 #define hci_req_unlock(d)       mutex_unlock(&d->req_lock)
 
-void hci_req_complete(struct hci_dev *hdev, int result);
+void hci_req_complete(struct hci_dev *hdev, __u16 cmd, int result);
 
 #endif /* __HCI_CORE_H */
diff --git a/include/net/bluetooth/mgmt.h b/include/net/bluetooth/mgmt.h
new file mode 100644
index 000000000000..ca29c1367ffd
--- /dev/null
+++ b/include/net/bluetooth/mgmt.h
@@ -0,0 +1,87 @@
+/*
+   BlueZ - Bluetooth protocol stack for Linux
+
+   Copyright (C) 2010  Nokia Corporation
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License version 2 as
+   published by the Free Software Foundation;
+
+   THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+   OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+   FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+   IN NO EVENT SHALL THE COPYRIGHT HOLDER(S) AND AUTHOR(S) BE LIABLE FOR ANY
+   CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES
+   WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+   ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+   OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+
+   ALL LIABILITY, INCLUDING LIABILITY FOR INFRINGEMENT OF ANY PATENTS,
+   COPYRIGHTS, TRADEMARKS OR OTHER RIGHTS, RELATING TO USE OF THIS
+   SOFTWARE IS DISCLAIMED.
+*/
+
+struct mgmt_hdr {
+        __le16 opcode;
+        __le16 len;
+} __packed;
+#define MGMT_HDR_SIZE                   4
+
+#define MGMT_OP_READ_VERSION            0x0001
+struct mgmt_rp_read_version {
+        __u8 version;
+        __le16 revision;
+} __packed;
+
+#define MGMT_OP_READ_INDEX_LIST         0x0003
+struct mgmt_rp_read_index_list {
+        __le16 num_controllers;
+        __le16 index[0];
+} __packed;
+
+#define MGMT_OP_READ_INFO               0x0004
+struct mgmt_cp_read_info {
+        __le16 index;
+} __packed;
+struct mgmt_rp_read_info {
+        __le16 index;
+        __u8 type;
+        __u8 powered;
+        __u8 discoverable;
+        __u8 pairable;
+        __u8 sec_mode;
+        bdaddr_t bdaddr;
+        __u8 dev_class[3];
+        __u8 features[8];
+        __u16 manufacturer;
+        __u8 hci_ver;
+        __u16 hci_rev;
+} __packed;
+
+#define MGMT_EV_CMD_COMPLETE            0x0001
+struct mgmt_ev_cmd_complete {
+        __le16 opcode;
+        __u8 data[0];
+} __packed;
+
+#define MGMT_EV_CMD_STATUS              0x0002
+struct mgmt_ev_cmd_status {
+        __u8 status;
+        __le16 opcode;
+} __packed;
+
+#define MGMT_EV_CONTROLLER_ERROR        0x0003
+struct mgmt_ev_controller_error {
+        __le16 index;
+        __u8 error_code;
+} __packed;
+
+#define MGMT_EV_INDEX_ADDED             0x0004
+struct mgmt_ev_index_added {
+        __le16 index;
+} __packed;
+
+#define MGMT_EV_INDEX_REMOVED           0x0005
+struct mgmt_ev_index_removed {
+        __le16 index;
+} __packed;