Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

* 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6: (30 commits)
  [IPSEC] IPV6: Fix to add tunnel mode SA correctly.
  [NET]: Cut off the queue_mapping field from sk_buff
  [NET]: Hide the queue_mapping field inside netif_subqueue_stopped
  [NET]: Make and use skb_get_queue_mapping
  [NET]: Use the skb_set_queue_mapping where appropriate
  [INET]: Use MODULE_ALIAS_NET_PF_PROTO_TYPE where possible.
  [INET]: Let inet_diag and friends autoload
  [NIU]: Cleanup PAGE_SIZE checks a bit
  [NET]: Fix SKB_WITH_OVERHEAD calculation
  [ATM]: Fix clip module reload crash.
  [TG3]: Update version to 3.85
  [TG3]: PCI command adjustment
  [TG3]: Add management FW version to ethtool report
  [TG3]: Add 5723 support
  [Bluetooth] Convert RFCOMM to use kthread API
  [Bluetooth] Add constant for Bluetooth socket options level
  [Bluetooth] Add support for handling simple eSCO links
  [Bluetooth] Add address and channel attribute to RFCOMM TTY device
  [Bluetooth] Fix wrong argument in debug code of HIDP
  [Bluetooth] Add generic driver for Bluetooth USB devices
  ...

8 files changed, 414 insertions, 268 deletions

diff --git a/include/linux/net.h b/include/linux/net.h
index c136abce7ef6..dd79cdb8c4cf 100644
--- a/include/linux/net.h
+++ b/include/linux/net.h
@@ -313,6 +313,10 @@ static const struct proto_ops name##_ops = {			\
 #define MODULE_ALIAS_NET_PF_PROTO(pf, proto) \
         MODULE_ALIAS("net-pf-" __stringify(pf) "-proto-" __stringify(proto))
 
+#define MODULE_ALIAS_NET_PF_PROTO_TYPE(pf, proto, type) \
+        MODULE_ALIAS("net-pf-" __stringify(pf) "-proto-" __stringify(proto) \
+                     "-type-" __stringify(type))
+
 #ifdef CONFIG_SYSCTL
 #include <linux/sysctl.h>
 extern ctl_table net_table[];
diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h
index 6f85db3535e2..4a3f54e358e5 100644
--- a/include/linux/netdevice.h
+++ b/include/linux/netdevice.h
@@ -996,7 +996,7 @@ static inline void netif_stop_subqueue(struct net_device *dev, u16 queue_index)
  *
  * Check individual transmit queue of a device with multiple transmit queues.
  */
-static inline int netif_subqueue_stopped(const struct net_device *dev,
+static inline int __netif_subqueue_stopped(const struct net_device *dev,
                                          u16 queue_index)
 {
 #ifdef CONFIG_NETDEVICES_MULTIQUEUE
@@ -1007,6 +1007,11 @@ static inline int netif_subqueue_stopped(const struct net_device *dev,
 #endif
 }
 
+static inline int netif_subqueue_stopped(const struct net_device *dev,
+                                         struct sk_buff *skb)
+{
+        return __netif_subqueue_stopped(dev, skb_get_queue_mapping(skb));
+}
 
 /**
  *      netif_wake_subqueue - allow sending packets on subqueue
diff --git a/include/linux/pci_ids.h b/include/linux/pci_ids.h
index df948b44edad..4e10a074ca56 100644
--- a/include/linux/pci_ids.h
+++ b/include/linux/pci_ids.h
@@ -1943,6 +1943,7 @@
 #define PCI_DEVICE_ID_TIGON3_5720       0x1658
 #define PCI_DEVICE_ID_TIGON3_5721       0x1659
 #define PCI_DEVICE_ID_TIGON3_5722       0x165a
+#define PCI_DEVICE_ID_TIGON3_5723       0x165b
 #define PCI_DEVICE_ID_TIGON3_5705M      0x165d
 #define PCI_DEVICE_ID_TIGON3_5705M_2    0x165e
 #define PCI_DEVICE_ID_TIGON3_5714       0x1668
diff --git a/include/linux/skbuff.h b/include/linux/skbuff.h
index f93f22b3d2ff..fd4e12f24270 100644
--- a/include/linux/skbuff.h
+++ b/include/linux/skbuff.h
@@ -41,8 +41,7 @@
 #define SKB_DATA_ALIGN(X)       (((X) + (SMP_CACHE_BYTES - 1)) & \
                                  ~(SMP_CACHE_BYTES - 1))
 #define SKB_WITH_OVERHEAD(X)    \
-        (((X) - sizeof(struct skb_shared_info)) & \
-         ~(SMP_CACHE_BYTES - 1))
+        ((X) - SKB_DATA_ALIGN(sizeof(struct skb_shared_info)))
 #define SKB_MAX_ORDER(X, ORDER) \
         SKB_WITH_OVERHEAD((PAGE_SIZE << (ORDER)) - (X))
 #define SKB_MAX_HEAD(X)         (SKB_MAX_ORDER((X), 0))
@@ -301,8 +300,9 @@ struct sk_buff {
 #endif
 
         int                     iif;
+#ifdef CONFIG_NETDEVICES_MULTIQUEUE
         __u16                   queue_mapping;
-
+#endif
 #ifdef CONFIG_NET_SCHED
         __u16                   tc_index;       /* traffic control index */
 #ifdef CONFIG_NET_CLS_ACT
@@ -1770,6 +1770,15 @@ static inline void skb_set_queue_mapping(struct sk_buff *skb, u16 queue_mapping)
 #endif
 }
 
+static inline u16 skb_get_queue_mapping(struct sk_buff *skb)
+{
+#ifdef CONFIG_NETDEVICES_MULTIQUEUE
+        return skb->queue_mapping;
+#else
+        return 0;
+#endif
+}
+
 static inline void skb_copy_queue_mapping(struct sk_buff *to, const struct sk_buff *from)
 {
 #ifdef CONFIG_NETDEVICES_MULTIQUEUE
diff --git a/include/linux/socket.h b/include/linux/socket.h
index f852e1afd65a..c22ef1c1afb8 100644
--- a/include/linux/socket.h
+++ b/include/linux/socket.h
@@ -291,6 +291,7 @@ struct ucred {
 #define SOL_TIPC        271
 #define SOL_RXRPC       272
 #define SOL_PPPOL2TP    273
+#define SOL_BLUETOOTH   274
 
 /* IPX options */
 #define IPX_TYPE        1
diff --git a/include/net/bluetooth/hci.h b/include/net/bluetooth/hci.h
index ebfb96b41106..a8a9eb6af966 100644
--- a/include/net/bluetooth/hci.h
+++ b/include/net/bluetooth/hci.h
@@ -200,119 +200,18 @@ enum {
 #define HCI_LM_SECURE   0x0020
 
 /* -----  HCI Commands ---- */
-/* OGF & OCF values */
-
-/* Informational Parameters */
-#define OGF_INFO_PARAM  0x04
-
-#define OCF_READ_LOCAL_VERSION  0x0001
-struct hci_rp_read_loc_version {
-        __u8     status;
-        __u8     hci_ver;
-        __le16   hci_rev;
-        __u8     lmp_ver;
-        __le16   manufacturer;
-        __le16   lmp_subver;
-} __attribute__ ((packed));
-
-#define OCF_READ_LOCAL_FEATURES 0x0003
-struct hci_rp_read_local_features {
-        __u8 status;
-        __u8 features[8];
-} __attribute__ ((packed));
-
-#define OCF_READ_BUFFER_SIZE    0x0005
-struct hci_rp_read_buffer_size {
-        __u8     status;
-        __le16   acl_mtu;
-        __u8     sco_mtu;
-        __le16   acl_max_pkt;
-        __le16   sco_max_pkt;
-} __attribute__ ((packed));
-
-#define OCF_READ_BD_ADDR        0x0009
-struct hci_rp_read_bd_addr {
-        __u8     status;
-        bdaddr_t bdaddr;
-} __attribute__ ((packed));
-
-/* Host Controller and Baseband */
-#define OGF_HOST_CTL    0x03
-#define OCF_RESET               0x0003
-#define OCF_READ_AUTH_ENABLE    0x001F
-#define OCF_WRITE_AUTH_ENABLE   0x0020
-        #define AUTH_DISABLED           0x00
-        #define AUTH_ENABLED            0x01
-
-#define OCF_READ_ENCRYPT_MODE   0x0021
-#define OCF_WRITE_ENCRYPT_MODE  0x0022
-        #define ENCRYPT_DISABLED        0x00
-        #define ENCRYPT_P2P             0x01
-        #define ENCRYPT_BOTH            0x02
-
-#define OCF_WRITE_CA_TIMEOUT    0x0016  
-#define OCF_WRITE_PG_TIMEOUT    0x0018
-
-#define OCF_WRITE_SCAN_ENABLE   0x001A
-        #define SCAN_DISABLED           0x00
-        #define SCAN_INQUIRY            0x01
-        #define SCAN_PAGE               0x02
-
-#define OCF_SET_EVENT_FLT       0x0005
-struct hci_cp_set_event_flt {
-        __u8     flt_type;
-        __u8     cond_type;
-        __u8     condition[0];
-} __attribute__ ((packed));
-
-/* Filter types */
-#define HCI_FLT_CLEAR_ALL       0x00
-#define HCI_FLT_INQ_RESULT      0x01
-#define HCI_FLT_CONN_SETUP      0x02
-
-/* CONN_SETUP Condition types */
-#define HCI_CONN_SETUP_ALLOW_ALL        0x00
-#define HCI_CONN_SETUP_ALLOW_CLASS      0x01
-#define HCI_CONN_SETUP_ALLOW_BDADDR     0x02
-
-/* CONN_SETUP Conditions */
-#define HCI_CONN_SETUP_AUTO_OFF 0x01
-#define HCI_CONN_SETUP_AUTO_ON  0x02
-
-#define OCF_READ_CLASS_OF_DEV   0x0023
-struct hci_rp_read_dev_class {
-        __u8     status;
-        __u8     dev_class[3];
-} __attribute__ ((packed));
-
-#define OCF_WRITE_CLASS_OF_DEV  0x0024
-struct hci_cp_write_dev_class {
-        __u8     dev_class[3];
-} __attribute__ ((packed));
-
-#define OCF_READ_VOICE_SETTING  0x0025
-struct hci_rp_read_voice_setting {
-        __u8     status;
-        __le16   voice_setting;
+#define HCI_OP_INQUIRY                  0x0401
+struct hci_cp_inquiry {
+        __u8     lap[3];
+        __u8     length;
+        __u8     num_rsp;
 } __attribute__ ((packed));
 
-#define OCF_WRITE_VOICE_SETTING 0x0026
-struct hci_cp_write_voice_setting {
-        __le16   voice_setting;
-} __attribute__ ((packed));
+#define HCI_OP_INQUIRY_CANCEL           0x0402
 
-#define OCF_HOST_BUFFER_SIZE    0x0033
-struct hci_cp_host_buffer_size {
-        __le16   acl_mtu;
-        __u8     sco_mtu;
-        __le16   acl_max_pkt;
-        __le16   sco_max_pkt;
-} __attribute__ ((packed));
-
-/* Link Control */
-#define OGF_LINK_CTL    0x01 
+#define HCI_OP_EXIT_PERIODIC_INQ        0x0404
 
-#define OCF_CREATE_CONN         0x0005
+#define HCI_OP_CREATE_CONN              0x0405
 struct hci_cp_create_conn {
         bdaddr_t bdaddr;
         __le16   pkt_type;
@@ -322,105 +221,138 @@ struct hci_cp_create_conn {
         __u8     role_switch;
 } __attribute__ ((packed));
 
-#define OCF_CREATE_CONN_CANCEL  0x0008
-struct hci_cp_create_conn_cancel {
-        bdaddr_t bdaddr;
-} __attribute__ ((packed));
-
-#define OCF_ACCEPT_CONN_REQ     0x0009
-struct hci_cp_accept_conn_req {
-        bdaddr_t bdaddr;
-        __u8     role;
-} __attribute__ ((packed));
-
-#define OCF_REJECT_CONN_REQ     0x000a
-struct hci_cp_reject_conn_req {
-        bdaddr_t bdaddr;
-        __u8     reason;
-} __attribute__ ((packed));
-
-#define OCF_DISCONNECT  0x0006
+#define HCI_OP_DISCONNECT               0x0406
 struct hci_cp_disconnect {
         __le16   handle;
         __u8     reason;
 } __attribute__ ((packed));
 
-#define OCF_ADD_SCO     0x0007
+#define HCI_OP_ADD_SCO                  0x0407
 struct hci_cp_add_sco {
         __le16   handle;
         __le16   pkt_type;
 } __attribute__ ((packed));
 
-#define OCF_INQUIRY             0x0001
-struct hci_cp_inquiry {
-        __u8     lap[3];
-        __u8     length;
-        __u8     num_rsp;
+#define HCI_OP_CREATE_CONN_CANCEL       0x0408
+struct hci_cp_create_conn_cancel {
+        bdaddr_t bdaddr;
 } __attribute__ ((packed));
 
-#define OCF_INQUIRY_CANCEL      0x0002
+#define HCI_OP_ACCEPT_CONN_REQ          0x0409
+struct hci_cp_accept_conn_req {
+        bdaddr_t bdaddr;
+        __u8     role;
+} __attribute__ ((packed));
 
-#define OCF_EXIT_PERIODIC_INQ   0x0004
+#define HCI_OP_REJECT_CONN_REQ          0x040a
+struct hci_cp_reject_conn_req {
+        bdaddr_t bdaddr;
+        __u8     reason;
+} __attribute__ ((packed));
 
-#define OCF_LINK_KEY_REPLY      0x000B
+#define HCI_OP_LINK_KEY_REPLY           0x040b
 struct hci_cp_link_key_reply {
         bdaddr_t bdaddr;
         __u8     link_key[16];
 } __attribute__ ((packed));
 
-#define OCF_LINK_KEY_NEG_REPLY  0x000C
+#define HCI_OP_LINK_KEY_NEG_REPLY       0x040c
 struct hci_cp_link_key_neg_reply {
         bdaddr_t bdaddr;
 } __attribute__ ((packed));
 
-#define OCF_PIN_CODE_REPLY      0x000D
+#define HCI_OP_PIN_CODE_REPLY           0x040d
 struct hci_cp_pin_code_reply {
         bdaddr_t bdaddr;
         __u8     pin_len;
         __u8     pin_code[16];
 } __attribute__ ((packed));
 
-#define OCF_PIN_CODE_NEG_REPLY  0x000E
+#define HCI_OP_PIN_CODE_NEG_REPLY       0x040e
 struct hci_cp_pin_code_neg_reply {
         bdaddr_t bdaddr;
 } __attribute__ ((packed));
 
-#define OCF_CHANGE_CONN_PTYPE   0x000F
+#define HCI_OP_CHANGE_CONN_PTYPE        0x040f
 struct hci_cp_change_conn_ptype {
         __le16   handle;
         __le16   pkt_type;
 } __attribute__ ((packed));
 
-#define OCF_AUTH_REQUESTED      0x0011
+#define HCI_OP_AUTH_REQUESTED           0x0411
 struct hci_cp_auth_requested {
         __le16   handle;
 } __attribute__ ((packed));
 
-#define OCF_SET_CONN_ENCRYPT    0x0013
+#define HCI_OP_SET_CONN_ENCRYPT         0x0413
 struct hci_cp_set_conn_encrypt {
         __le16   handle;
         __u8     encrypt;
 } __attribute__ ((packed));
 
-#define OCF_CHANGE_CONN_LINK_KEY 0x0015
+#define HCI_OP_CHANGE_CONN_LINK_KEY     0x0415
 struct hci_cp_change_conn_link_key {
         __le16   handle;
 } __attribute__ ((packed));
 
-#define OCF_READ_REMOTE_FEATURES 0x001B
+#define HCI_OP_REMOTE_NAME_REQ          0x0419
+struct hci_cp_remote_name_req {
+        bdaddr_t bdaddr;
+        __u8     pscan_rep_mode;
+        __u8     pscan_mode;
+        __le16   clock_offset;
+} __attribute__ ((packed));
+
+#define HCI_OP_REMOTE_NAME_REQ_CANCEL   0x041a
+struct hci_cp_remote_name_req_cancel {
+        bdaddr_t bdaddr;
+} __attribute__ ((packed));
+
+#define HCI_OP_READ_REMOTE_FEATURES     0x041b
 struct hci_cp_read_remote_features {
         __le16   handle;
 } __attribute__ ((packed));
 
-#define OCF_READ_REMOTE_VERSION 0x001D
+#define HCI_OP_READ_REMOTE_EXT_FEATURES 0x041c
+struct hci_cp_read_remote_ext_features {
+        __le16   handle;
+        __u8     page;
+} __attribute__ ((packed));
+
+#define HCI_OP_READ_REMOTE_VERSION      0x041d
 struct hci_cp_read_remote_version {
         __le16   handle;
 } __attribute__ ((packed));
 
-/* Link Policy */
-#define OGF_LINK_POLICY 0x02   
+#define HCI_OP_SETUP_SYNC_CONN          0x0428
+struct hci_cp_setup_sync_conn {
+        __le16   handle;
+        __le32   tx_bandwidth;
+        __le32   rx_bandwidth;
+        __le16   max_latency;
+        __le16   voice_setting;
+        __u8     retrans_effort;
+        __le16   pkt_type;
+} __attribute__ ((packed));
 
-#define OCF_SNIFF_MODE          0x0003
+#define HCI_OP_ACCEPT_SYNC_CONN_REQ     0x0429
+struct hci_cp_accept_sync_conn_req {
+        bdaddr_t bdaddr;
+        __le32   tx_bandwidth;
+        __le32   rx_bandwidth;
+        __le16   max_latency;
+        __le16   content_format;
+        __u8     retrans_effort;
+        __le16   pkt_type;
+} __attribute__ ((packed));
+
+#define HCI_OP_REJECT_SYNC_CONN_REQ     0x042a
+struct hci_cp_reject_sync_conn_req {
+        bdaddr_t bdaddr;
+        __u8     reason;
+} __attribute__ ((packed));
+
+#define HCI_OP_SNIFF_MODE               0x0803
 struct hci_cp_sniff_mode {
         __le16   handle;
         __le16   max_interval;
@@ -429,12 +361,12 @@ struct hci_cp_sniff_mode {
         __le16   timeout;
 } __attribute__ ((packed));
 
-#define OCF_EXIT_SNIFF_MODE     0x0004
+#define HCI_OP_EXIT_SNIFF_MODE          0x0804
 struct hci_cp_exit_sniff_mode {
         __le16   handle;
 } __attribute__ ((packed));
 
-#define OCF_ROLE_DISCOVERY      0x0009
+#define HCI_OP_ROLE_DISCOVERY           0x0809
 struct hci_cp_role_discovery {
         __le16   handle;
 } __attribute__ ((packed));
@@ -444,7 +376,13 @@ struct hci_rp_role_discovery {
         __u8     role;
 } __attribute__ ((packed));
 
-#define OCF_READ_LINK_POLICY    0x000C
+#define HCI_OP_SWITCH_ROLE              0x080b
+struct hci_cp_switch_role {
+        bdaddr_t bdaddr;
+        __u8     role;
+} __attribute__ ((packed));
+
+#define HCI_OP_READ_LINK_POLICY         0x080c
 struct hci_cp_read_link_policy {
         __le16   handle;
 } __attribute__ ((packed));
@@ -454,13 +392,7 @@ struct hci_rp_read_link_policy {
         __le16   policy;
 } __attribute__ ((packed));
 
-#define OCF_SWITCH_ROLE         0x000B
-struct hci_cp_switch_role {
-        bdaddr_t bdaddr;
-        __u8     role;
-} __attribute__ ((packed));
-
-#define OCF_WRITE_LINK_POLICY   0x000D
+#define HCI_OP_WRITE_LINK_POLICY        0x080d
 struct hci_cp_write_link_policy {
         __le16   handle;
         __le16   policy;
@@ -470,7 +402,7 @@ struct hci_rp_write_link_policy {
         __le16   handle;
 } __attribute__ ((packed));
 
-#define OCF_SNIFF_SUBRATE       0x0011
+#define HCI_OP_SNIFF_SUBRATE            0x0811
 struct hci_cp_sniff_subrate {
         __le16   handle;
         __le16   max_latency;
@@ -478,59 +410,156 @@ struct hci_cp_sniff_subrate {
         __le16   min_local_timeout;
 } __attribute__ ((packed));
 
-/* Status params */
-#define OGF_STATUS_PARAM        0x05
+#define HCI_OP_SET_EVENT_MASK           0x0c01
+struct hci_cp_set_event_mask {
+        __u8     mask[8];
+} __attribute__ ((packed));
 
-/* Testing commands */
-#define OGF_TESTING_CMD         0x3E
+#define HCI_OP_RESET                    0x0c03
 
-/* Vendor specific commands */
-#define OGF_VENDOR_CMD          0x3F
+#define HCI_OP_SET_EVENT_FLT            0x0c05
+struct hci_cp_set_event_flt {
+        __u8     flt_type;
+        __u8     cond_type;
+        __u8     condition[0];
+} __attribute__ ((packed));
 
-/* ---- HCI Events ---- */
-#define HCI_EV_INQUIRY_COMPLETE 0x01
+/* Filter types */
+#define HCI_FLT_CLEAR_ALL       0x00
+#define HCI_FLT_INQ_RESULT      0x01
+#define HCI_FLT_CONN_SETUP      0x02
 
-#define HCI_EV_INQUIRY_RESULT   0x02
-struct inquiry_info {
-        bdaddr_t bdaddr;
-        __u8     pscan_rep_mode;
-        __u8     pscan_period_mode;
-        __u8     pscan_mode;
+/* CONN_SETUP Condition types */
+#define HCI_CONN_SETUP_ALLOW_ALL        0x00
+#define HCI_CONN_SETUP_ALLOW_CLASS      0x01
+#define HCI_CONN_SETUP_ALLOW_BDADDR     0x02
+
+/* CONN_SETUP Conditions */
+#define HCI_CONN_SETUP_AUTO_OFF 0x01
+#define HCI_CONN_SETUP_AUTO_ON  0x02
+
+#define HCI_OP_WRITE_LOCAL_NAME         0x0c13
+struct hci_cp_write_local_name {
+        __u8     name[248];
+} __attribute__ ((packed));
+
+#define HCI_OP_READ_LOCAL_NAME          0x0c14
+struct hci_rp_read_local_name {
+        __u8     status;
+        __u8     name[248];
+} __attribute__ ((packed));
+
+#define HCI_OP_WRITE_CA_TIMEOUT         0x0c16
+
+#define HCI_OP_WRITE_PG_TIMEOUT         0x0c18
+
+#define HCI_OP_WRITE_SCAN_ENABLE        0x0c1a
+        #define SCAN_DISABLED           0x00
+        #define SCAN_INQUIRY            0x01
+        #define SCAN_PAGE               0x02
+
+#define HCI_OP_READ_AUTH_ENABLE         0x0c1f
+
+#define HCI_OP_WRITE_AUTH_ENABLE        0x0c20
+        #define AUTH_DISABLED           0x00
+        #define AUTH_ENABLED            0x01
+
+#define HCI_OP_READ_ENCRYPT_MODE        0x0c21
+
+#define HCI_OP_WRITE_ENCRYPT_MODE       0x0c22
+        #define ENCRYPT_DISABLED        0x00
+        #define ENCRYPT_P2P             0x01
+        #define ENCRYPT_BOTH            0x02
+
+#define HCI_OP_READ_CLASS_OF_DEV        0x0c23
+struct hci_rp_read_class_of_dev {
+        __u8     status;
         __u8     dev_class[3];
-        __le16   clock_offset;
 } __attribute__ ((packed));
 
-#define HCI_EV_INQUIRY_RESULT_WITH_RSSI 0x22
-struct inquiry_info_with_rssi {
-        bdaddr_t bdaddr;
-        __u8     pscan_rep_mode;
-        __u8     pscan_period_mode;
+#define HCI_OP_WRITE_CLASS_OF_DEV       0x0c24
+struct hci_cp_write_class_of_dev {
         __u8     dev_class[3];
-        __le16   clock_offset;
-        __s8     rssi;
 } __attribute__ ((packed));
-struct inquiry_info_with_rssi_and_pscan_mode {
+
+#define HCI_OP_READ_VOICE_SETTING       0x0c25
+struct hci_rp_read_voice_setting {
+        __u8     status;
+        __le16   voice_setting;
+} __attribute__ ((packed));
+
+#define HCI_OP_WRITE_VOICE_SETTING      0x0c26
+struct hci_cp_write_voice_setting {
+        __le16   voice_setting;
+} __attribute__ ((packed));
+
+#define HCI_OP_HOST_BUFFER_SIZE         0x0c33
+struct hci_cp_host_buffer_size {
+        __le16   acl_mtu;
+        __u8     sco_mtu;
+        __le16   acl_max_pkt;
+        __le16   sco_max_pkt;
+} __attribute__ ((packed));
+
+#define HCI_OP_READ_LOCAL_VERSION       0x1001
+struct hci_rp_read_local_version {
+        __u8     status;
+        __u8     hci_ver;
+        __le16   hci_rev;
+        __u8     lmp_ver;
+        __le16   manufacturer;
+        __le16   lmp_subver;
+} __attribute__ ((packed));
+
+#define HCI_OP_READ_LOCAL_COMMANDS      0x1002
+struct hci_rp_read_local_commands {
+        __u8     status;
+        __u8     commands[64];
+} __attribute__ ((packed));
+
+#define HCI_OP_READ_LOCAL_FEATURES      0x1003
+struct hci_rp_read_local_features {
+        __u8     status;
+        __u8     features[8];
+} __attribute__ ((packed));
+
+#define HCI_OP_READ_LOCAL_EXT_FEATURES  0x1004
+struct hci_rp_read_local_ext_features {
+        __u8     status;
+        __u8     page;
+        __u8     max_page;
+        __u8     features[8];
+} __attribute__ ((packed));
+
+#define HCI_OP_READ_BUFFER_SIZE         0x1005
+struct hci_rp_read_buffer_size {
+        __u8     status;
+        __le16   acl_mtu;
+        __u8     sco_mtu;
+        __le16   acl_max_pkt;
+        __le16   sco_max_pkt;
+} __attribute__ ((packed));
+
+#define HCI_OP_READ_BD_ADDR             0x1009
+struct hci_rp_read_bd_addr {
+        __u8     status;
         bdaddr_t bdaddr;
-        __u8     pscan_rep_mode;
-        __u8     pscan_period_mode;
-        __u8     pscan_mode;
-        __u8     dev_class[3];
-        __le16   clock_offset;
-        __s8     rssi;
 } __attribute__ ((packed));
 
-#define HCI_EV_EXTENDED_INQUIRY_RESULT  0x2F
-struct extended_inquiry_info {
+/* ---- HCI Events ---- */
+#define HCI_EV_INQUIRY_COMPLETE         0x01
+
+#define HCI_EV_INQUIRY_RESULT           0x02
+struct inquiry_info {
         bdaddr_t bdaddr;
         __u8     pscan_rep_mode;
         __u8     pscan_period_mode;
+        __u8     pscan_mode;
         __u8     dev_class[3];
         __le16   clock_offset;
-        __s8     rssi;
-        __u8     data[240];
 } __attribute__ ((packed));
 
-#define HCI_EV_CONN_COMPLETE    0x03
+#define HCI_EV_CONN_COMPLETE            0x03
 struct hci_ev_conn_complete {
         __u8     status;
         __le16   handle;
@@ -539,40 +568,63 @@ struct hci_ev_conn_complete {
         __u8     encr_mode;
 } __attribute__ ((packed));
 
-#define HCI_EV_CONN_REQUEST     0x04
+#define HCI_EV_CONN_REQUEST             0x04
 struct hci_ev_conn_request {
         bdaddr_t bdaddr;
         __u8     dev_class[3];
         __u8     link_type;
 } __attribute__ ((packed));
 
-#define HCI_EV_DISCONN_COMPLETE 0x05
+#define HCI_EV_DISCONN_COMPLETE         0x05
 struct hci_ev_disconn_complete {
         __u8     status;
         __le16   handle;
         __u8     reason;
 } __attribute__ ((packed));
 
-#define HCI_EV_AUTH_COMPLETE    0x06
+#define HCI_EV_AUTH_COMPLETE            0x06
 struct hci_ev_auth_complete {
         __u8     status;
         __le16   handle;
 } __attribute__ ((packed));
 
-#define HCI_EV_ENCRYPT_CHANGE   0x08
+#define HCI_EV_REMOTE_NAME              0x07
+struct hci_ev_remote_name {
+        __u8     status;
+        bdaddr_t bdaddr;
+        __u8     name[248];
+} __attribute__ ((packed));
+
+#define HCI_EV_ENCRYPT_CHANGE           0x08
 struct hci_ev_encrypt_change {
         __u8     status;
         __le16   handle;
         __u8     encrypt;
 } __attribute__ ((packed));
 
-#define HCI_EV_CHANGE_CONN_LINK_KEY_COMPLETE    0x09
-struct hci_ev_change_conn_link_key_complete {
+#define HCI_EV_CHANGE_LINK_KEY_COMPLETE 0x09
+struct hci_ev_change_link_key_complete {
+        __u8     status;
+        __le16   handle;
+} __attribute__ ((packed));
+
+#define HCI_EV_REMOTE_FEATURES          0x0b
+struct hci_ev_remote_features {
+        __u8     status;
+        __le16   handle;
+        __u8     features[8];
+} __attribute__ ((packed));
+
+#define HCI_EV_REMOTE_VERSION           0x0c
+struct hci_ev_remote_version {
         __u8     status;
         __le16   handle;
+        __u8     lmp_ver;
+        __le16   manufacturer;
+        __le16   lmp_subver;
 } __attribute__ ((packed));
 
-#define HCI_EV_QOS_SETUP_COMPLETE       0x0D
+#define HCI_EV_QOS_SETUP_COMPLETE       0x0d
 struct hci_qos {
         __u8     service_type;
         __u32    token_rate;
@@ -586,33 +638,33 @@ struct hci_ev_qos_setup_complete {
         struct   hci_qos qos;
 } __attribute__ ((packed));
 
-#define HCI_EV_CMD_COMPLETE     0x0E
+#define HCI_EV_CMD_COMPLETE             0x0e
 struct hci_ev_cmd_complete {
         __u8     ncmd;
         __le16   opcode;
 } __attribute__ ((packed));
 
-#define HCI_EV_CMD_STATUS       0x0F
+#define HCI_EV_CMD_STATUS               0x0f
 struct hci_ev_cmd_status {
         __u8     status;
         __u8     ncmd;
         __le16   opcode;
 } __attribute__ ((packed));
 
-#define HCI_EV_NUM_COMP_PKTS    0x13
-struct hci_ev_num_comp_pkts {
-        __u8     num_hndl;
-        /* variable length part */
-} __attribute__ ((packed));
-
-#define HCI_EV_ROLE_CHANGE      0x12
+#define HCI_EV_ROLE_CHANGE              0x12
 struct hci_ev_role_change {
         __u8     status;
         bdaddr_t bdaddr;
         __u8     role;
 } __attribute__ ((packed));
 
-#define HCI_EV_MODE_CHANGE      0x14
+#define HCI_EV_NUM_COMP_PKTS            0x13
+struct hci_ev_num_comp_pkts {
+        __u8     num_hndl;
+        /* variable length part */
+} __attribute__ ((packed));
+
+#define HCI_EV_MODE_CHANGE              0x14
 struct hci_ev_mode_change {
         __u8     status;
         __le16   handle;
@@ -620,53 +672,88 @@ struct hci_ev_mode_change {
         __le16   interval;
 } __attribute__ ((packed));
 
-#define HCI_EV_PIN_CODE_REQ     0x16
+#define HCI_EV_PIN_CODE_REQ             0x16
 struct hci_ev_pin_code_req {
         bdaddr_t bdaddr;
 } __attribute__ ((packed));
 
-#define HCI_EV_LINK_KEY_REQ     0x17
+#define HCI_EV_LINK_KEY_REQ             0x17
 struct hci_ev_link_key_req {
         bdaddr_t bdaddr;
 } __attribute__ ((packed));
 
-#define HCI_EV_LINK_KEY_NOTIFY  0x18
+#define HCI_EV_LINK_KEY_NOTIFY          0x18
 struct hci_ev_link_key_notify {
         bdaddr_t bdaddr;
-        __u8     link_key[16];
-        __u8     key_type;
+        __u8     link_key[16];
+        __u8     key_type;
 } __attribute__ ((packed));
 
-#define HCI_EV_REMOTE_FEATURES  0x0B
-struct hci_ev_remote_features {
+#define HCI_EV_CLOCK_OFFSET             0x1c
+struct hci_ev_clock_offset {
         __u8     status;
         __le16   handle;
-        __u8     features[8];
+        __le16   clock_offset;
 } __attribute__ ((packed));
 
-#define HCI_EV_REMOTE_VERSION   0x0C
-struct hci_ev_remote_version {
+#define HCI_EV_PSCAN_REP_MODE           0x20
+struct hci_ev_pscan_rep_mode {
+        bdaddr_t bdaddr;
+        __u8     pscan_rep_mode;
+} __attribute__ ((packed));
+
+#define HCI_EV_INQUIRY_RESULT_WITH_RSSI 0x22
+struct inquiry_info_with_rssi {
+        bdaddr_t bdaddr;
+        __u8     pscan_rep_mode;
+        __u8     pscan_period_mode;
+        __u8     dev_class[3];
+        __le16   clock_offset;
+        __s8     rssi;
+} __attribute__ ((packed));
+struct inquiry_info_with_rssi_and_pscan_mode {
+        bdaddr_t bdaddr;
+        __u8     pscan_rep_mode;
+        __u8     pscan_period_mode;
+        __u8     pscan_mode;
+        __u8     dev_class[3];
+        __le16   clock_offset;
+        __s8     rssi;
+} __attribute__ ((packed));
+
+#define HCI_EV_REMOTE_EXT_FEATURES      0x23
+struct hci_ev_remote_ext_features {
         __u8     status;
         __le16   handle;
-        __u8     lmp_ver;
-        __le16   manufacturer;
-        __le16   lmp_subver;
+        __u8     page;
+        __u8     max_page;
+        __u8     features[8];
 } __attribute__ ((packed));
 
-#define HCI_EV_CLOCK_OFFSET     0x01C
-struct hci_ev_clock_offset {
+#define HCI_EV_SYNC_CONN_COMPLETE       0x2c
+struct hci_ev_sync_conn_complete {
         __u8     status;
         __le16   handle;
-        __le16   clock_offset;
+        bdaddr_t bdaddr;
+        __u8     link_type;
+        __u8     tx_interval;
+        __u8     retrans_window;
+        __le16   rx_pkt_len;
+        __le16   tx_pkt_len;
+        __u8     air_mode;
 } __attribute__ ((packed));
 
-#define HCI_EV_PSCAN_REP_MODE   0x20
-struct hci_ev_pscan_rep_mode {
-        bdaddr_t bdaddr;
-        __u8     pscan_rep_mode;
+#define HCI_EV_SYNC_CONN_CHANGED        0x2d
+struct hci_ev_sync_conn_changed {
+        __u8     status;
+        __le16   handle;
+        __u8     tx_interval;
+        __u8     retrans_window;
+        __le16   rx_pkt_len;
+        __le16   tx_pkt_len;
 } __attribute__ ((packed));
 
-#define HCI_EV_SNIFF_SUBRATE    0x2E
+#define HCI_EV_SNIFF_SUBRATE            0x2e
 struct hci_ev_sniff_subrate {
         __u8     status;
         __le16   handle;
@@ -676,14 +763,25 @@ struct hci_ev_sniff_subrate {
         __le16   max_local_timeout;
 } __attribute__ ((packed));
 
+#define HCI_EV_EXTENDED_INQUIRY_RESULT  0x2f
+struct extended_inquiry_info {
+        bdaddr_t bdaddr;
+        __u8     pscan_rep_mode;
+        __u8     pscan_period_mode;
+        __u8     dev_class[3];
+        __le16   clock_offset;
+        __s8     rssi;
+        __u8     data[240];
+} __attribute__ ((packed));
+
 /* Internal events generated by Bluetooth stack */
-#define HCI_EV_STACK_INTERNAL   0xFD
+#define HCI_EV_STACK_INTERNAL   0xfd
 struct hci_ev_stack_internal {
         __u16    type;
         __u8     data[0];
 } __attribute__ ((packed));
 
-#define HCI_EV_SI_DEVICE        0x01
+#define HCI_EV_SI_DEVICE        0x01
 struct hci_ev_si_device {
         __u16    event;
         __u16    dev_id;
@@ -704,40 +802,40 @@ struct hci_ev_si_security {
 #define HCI_SCO_HDR_SIZE     3
 
 struct hci_command_hdr {
-        __le16  opcode;         /* OCF & OGF */
+        __le16  opcode;         /* OCF & OGF */
         __u8    plen;
 } __attribute__ ((packed));
 
 struct hci_event_hdr {
-        __u8    evt;
-        __u8    plen;
+        __u8    evt;
+        __u8    plen;
 } __attribute__ ((packed));
 
 struct hci_acl_hdr {
-        __le16  handle;         /* Handle & Flags(PB, BC) */
-        __le16  dlen;
+        __le16  handle;         /* Handle & Flags(PB, BC) */
+        __le16  dlen;
 } __attribute__ ((packed));
 
 struct hci_sco_hdr {
-        __le16  handle;
-        __u8    dlen;
+        __le16  handle;
+        __u8    dlen;
 } __attribute__ ((packed));
 
 #ifdef __KERNEL__
 #include <linux/skbuff.h>
 static inline struct hci_event_hdr *hci_event_hdr(const struct sk_buff *skb)
 {
-        return (struct hci_event_hdr *)skb->data;
+        return (struct hci_event_hdr *) skb->data;
 }
 
 static inline struct hci_acl_hdr *hci_acl_hdr(const struct sk_buff *skb)
 {
-        return (struct hci_acl_hdr *)skb->data;
+        return (struct hci_acl_hdr *) skb->data;
 }
 
 static inline struct hci_sco_hdr *hci_sco_hdr(const struct sk_buff *skb)
 {
-        return (struct hci_sco_hdr *)skb->data;
+        return (struct hci_sco_hdr *) skb->data;
 }
 #endif
 
@@ -771,13 +869,13 @@ struct sockaddr_hci {
 struct hci_filter {
         unsigned long type_mask;
         unsigned long event_mask[2];
-        __le16   opcode;
+        __le16 opcode;
 };
 
 struct hci_ufilter {
-        __u32   type_mask;
-        __u32   event_mask[2];
-        __le16   opcode;
+        __u32  type_mask;
+        __u32  event_mask[2];
+        __le16 opcode;
 };
 
 #define HCI_FLT_TYPE_BITS       31
@@ -825,15 +923,15 @@ struct hci_dev_info {
 struct hci_conn_info {
         __u16    handle;
         bdaddr_t bdaddr;
-        __u8     type;
-        __u8     out;
-        __u16    state;
-        __u32    link_mode;
+        __u8     type;
+        __u8     out;
+        __u16    state;
+        __u32    link_mode;
 };
 
 struct hci_dev_req {
-        __u16 dev_id;
-        __u32 dev_opt;
+        __u16  dev_id;
+        __u32  dev_opt;
 };
 
 struct hci_dev_list_req {
diff --git a/include/net/bluetooth/hci_core.h b/include/net/bluetooth/hci_core.h
index 8f67c8a7169b..ea13baa3851b 100644
--- a/include/net/bluetooth/hci_core.h
+++ b/include/net/bluetooth/hci_core.h
@@ -71,7 +71,10 @@ struct hci_dev {
         __u16           id;
         __u8            type;
         bdaddr_t        bdaddr;
+        __u8            dev_name[248];
+        __u8            dev_class[3];
         __u8            features[8];
+        __u8            commands[64];
         __u8            hci_ver;
         __u16           hci_rev;
         __u16           manufacturer;
@@ -310,10 +313,12 @@ static inline struct hci_conn *hci_conn_hash_lookup_state(struct hci_dev *hdev,
 void hci_acl_connect(struct hci_conn *conn);
 void hci_acl_disconn(struct hci_conn *conn, __u8 reason);
 void hci_add_sco(struct hci_conn *conn, __u16 handle);
+void hci_setup_sync(struct hci_conn *conn, __u16 handle);
 
 struct hci_conn *hci_conn_add(struct hci_dev *hdev, int type, bdaddr_t *dst);
-int    hci_conn_del(struct hci_conn *conn);
-void   hci_conn_hash_flush(struct hci_dev *hdev);
+int hci_conn_del(struct hci_conn *conn);
+void hci_conn_hash_flush(struct hci_dev *hdev);
+void hci_conn_check_pending(struct hci_dev *hdev);
 
 struct hci_conn *hci_connect(struct hci_dev *hdev, int type, bdaddr_t *src);
 int hci_conn_auth(struct hci_conn *conn);
@@ -617,11 +622,11 @@ int hci_unregister_cb(struct hci_cb *hcb);
 int hci_register_notifier(struct notifier_block *nb);
 int hci_unregister_notifier(struct notifier_block *nb);
 
-int hci_send_cmd(struct hci_dev *hdev, __u16 ogf, __u16 ocf, __u32 plen, void *param);
+int hci_send_cmd(struct hci_dev *hdev, __u16 opcode, __u32 plen, void *param);
 int hci_send_acl(struct hci_conn *conn, struct sk_buff *skb, __u16 flags);
 int hci_send_sco(struct hci_conn *conn, struct sk_buff *skb);
 
-void *hci_sent_cmd_data(struct hci_dev *hdev, __u16 ogf, __u16 ocf);
+void *hci_sent_cmd_data(struct hci_dev *hdev, __u16 opcode);
 
 void hci_si_event(struct hci_dev *hdev, int type, int dlen, void *data);
 
diff --git a/include/net/bluetooth/l2cap.h b/include/net/bluetooth/l2cap.h
index 70e70f5d3dd6..73e115bc12dd 100644
--- a/include/net/bluetooth/l2cap.h
+++ b/include/net/bluetooth/l2cap.h
@@ -29,7 +29,8 @@
 #define L2CAP_DEFAULT_MTU       672
 #define L2CAP_DEFAULT_FLUSH_TO  0xFFFF
 
-#define L2CAP_CONN_TIMEOUT      (HZ * 40)
+#define L2CAP_CONN_TIMEOUT      (40000) /* 40 seconds */
+#define L2CAP_INFO_TIMEOUT      (4000)  /*  4 seconds */
 
 /* L2CAP socket address */
 struct sockaddr_l2 {
@@ -148,6 +149,19 @@ struct l2cap_conf_opt {
 
 #define L2CAP_CONF_MAX_SIZE     22
 
+struct l2cap_conf_rfc {
+        __u8       mode;
+        __u8       txwin_size;
+        __u8       max_transmit;
+        __le16     retrans_timeout;
+        __le16     monitor_timeout;
+        __le16     max_pdu_size;
+} __attribute__ ((packed));
+
+#define L2CAP_MODE_BASIC        0x00
+#define L2CAP_MODE_RETRANS      0x01
+#define L2CAP_MODE_FLOWCTL      0x02
+
 struct l2cap_disconn_req {
         __le16     dcid;
         __le16     scid;
@@ -160,7 +174,6 @@ struct l2cap_disconn_rsp {
 
 struct l2cap_info_req {
         __le16      type;
-        __u8        data[0];
 } __attribute__ ((packed));
 
 struct l2cap_info_rsp {
@@ -192,6 +205,13 @@ struct l2cap_conn {
 
         unsigned int    mtu;
 
+        __u32           feat_mask;
+
+        __u8            info_state;
+        __u8            info_ident;
+
+        struct timer_list info_timer;
+
         spinlock_t      lock;
 
         struct sk_buff *rx_skb;
@@ -202,6 +222,9 @@ struct l2cap_conn {
         struct l2cap_chan_list chan_list;
 };
 
+#define L2CAP_INFO_CL_MTU_REQ_SENT      0x01
+#define L2CAP_INFO_FEAT_MASK_REQ_SENT   0x02
+
 /* ----- L2CAP channel and socket info ----- */
 #define l2cap_pi(sk) ((struct l2cap_pinfo *) sk)
 
@@ -221,7 +244,6 @@ struct l2cap_pinfo {
         __u8            conf_len;
         __u8            conf_state;
         __u8            conf_retry;
-        __u16           conf_mtu;
 
         __u8            ident;
 
@@ -232,10 +254,11 @@ struct l2cap_pinfo {
         struct sock             *prev_c;
 };
 
-#define L2CAP_CONF_REQ_SENT    0x01
-#define L2CAP_CONF_INPUT_DONE  0x02
-#define L2CAP_CONF_OUTPUT_DONE 0x04
-#define L2CAP_CONF_MAX_RETRIES 2
+#define L2CAP_CONF_REQ_SENT     0x01
+#define L2CAP_CONF_INPUT_DONE   0x02
+#define L2CAP_CONF_OUTPUT_DONE  0x04
+
+#define L2CAP_CONF_MAX_RETRIES  2
 
 void l2cap_load(void);