Merge branch 'for-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth-next

Johan Hedberg says:

====================
pull request: bluetooth-next 2015-10-22

Here's probably the last bluetooth-next pull request for 4.4. Among
several other changes it contains the rest of the fixes & cleanups from
the Bluetooth UnplugFest (that didn't need to be hurried to 4.3).

 - Refactoring & cleanups to 6lowpan code
 - New USB ids for two Atheros controllers and BCM43142A0 from Broadcom
 - Fix (quirk) for broken Broadcom BCM2045 controllers
 - Support for latest Apple controllers
 - Improvements to the vendor diagnostic message support

Please let me know if there are any issues pulling. Thanks.
====================

Signed-off-by: David S. Miller <davem@davemloft.net>

4 files changed, 110 insertions, 163 deletions

diff --git a/include/net/6lowpan.h b/include/net/6lowpan.h
index 07db532696df..cf3bc564ac03 100644
--- a/include/net/6lowpan.h
+++ b/include/net/6lowpan.h
@@ -56,85 +56,23 @@
 #include <net/ipv6.h>
 #include <net/net_namespace.h>
 
-#define UIP_802154_SHORTADDR_LEN        2  /* compressed ipv6 address length */
-#define UIP_IPH_LEN                     40 /* ipv6 fixed header size */
-#define UIP_PROTO_UDP                   17 /* ipv6 next header value for UDP */
-#define UIP_FRAGH_LEN                   8  /* ipv6 fragment header size */
-
 #define EUI64_ADDR_LEN          8
 
 #define LOWPAN_NHC_MAX_ID_LEN   1
+/* Maximum next header compression length which we currently support inclusive
+ * possible inline data.
+ */
+#define LOWPAN_NHC_MAX_HDR_LEN  (sizeof(struct udphdr))
 /* Max IPHC Header len without IPv6 hdr specific inline data.
  * Useful for getting the "extra" bytes we need at worst case compression.
  *
  * LOWPAN_IPHC + CID + LOWPAN_NHC_MAX_ID_LEN
  */
 #define LOWPAN_IPHC_MAX_HEADER_LEN      (2 + 1 + LOWPAN_NHC_MAX_ID_LEN)
-
-/*
- * ipv6 address based on mac
- * second bit-flip (Universe/Local) is done according RFC2464
- */
-#define is_addr_mac_addr_based(a, m) \
-        ((((a)->s6_addr[8])  == (((m)[0]) ^ 0x02)) &&   \
-         (((a)->s6_addr[9])  == (m)[1]) &&              \
-         (((a)->s6_addr[10]) == (m)[2]) &&              \
-         (((a)->s6_addr[11]) == (m)[3]) &&              \
-         (((a)->s6_addr[12]) == (m)[4]) &&              \
-         (((a)->s6_addr[13]) == (m)[5]) &&              \
-         (((a)->s6_addr[14]) == (m)[6]) &&              \
-         (((a)->s6_addr[15]) == (m)[7]))
-
-/*
- * check whether we can compress the IID to 16 bits,
- * it's possible for unicast adresses with first 49 bits are zero only.
- */
-#define lowpan_is_iid_16_bit_compressable(a)    \
-        ((((a)->s6_addr16[4]) == 0) &&          \
-         (((a)->s6_addr[10]) == 0) &&           \
-         (((a)->s6_addr[11]) == 0xff) &&        \
-         (((a)->s6_addr[12]) == 0xfe) &&        \
-         (((a)->s6_addr[13]) == 0))
-
-/* check whether the 112-bit gid of the multicast address is mappable to: */
-
-/* 48 bits, FFXX::00XX:XXXX:XXXX */
-#define lowpan_is_mcast_addr_compressable48(a)  \
-        ((((a)->s6_addr16[1]) == 0) &&          \
-         (((a)->s6_addr16[2]) == 0) &&          \
-         (((a)->s6_addr16[3]) == 0) &&          \
-         (((a)->s6_addr16[4]) == 0) &&          \
-         (((a)->s6_addr[10]) == 0))
-
-/* 32 bits, FFXX::00XX:XXXX */
-#define lowpan_is_mcast_addr_compressable32(a)  \
-        ((((a)->s6_addr16[1]) == 0) &&          \
-         (((a)->s6_addr16[2]) == 0) &&          \
-         (((a)->s6_addr16[3]) == 0) &&          \
-         (((a)->s6_addr16[4]) == 0) &&          \
-         (((a)->s6_addr16[5]) == 0) &&          \
-         (((a)->s6_addr[12]) == 0))
-
-/* 8 bits, FF02::00XX */
-#define lowpan_is_mcast_addr_compressable8(a)   \
-        ((((a)->s6_addr[1])  == 2) &&           \
-         (((a)->s6_addr16[1]) == 0) &&          \
-         (((a)->s6_addr16[2]) == 0) &&          \
-         (((a)->s6_addr16[3]) == 0) &&          \
-         (((a)->s6_addr16[4]) == 0) &&          \
-         (((a)->s6_addr16[5]) == 0) &&          \
-         (((a)->s6_addr16[6]) == 0) &&          \
-         (((a)->s6_addr[14]) == 0))
-
-#define lowpan_is_addr_broadcast(a)     \
-        ((((a)[0]) == 0xFF) &&  \
-         (((a)[1]) == 0xFF) &&  \
-         (((a)[2]) == 0xFF) &&  \
-         (((a)[3]) == 0xFF) &&  \
-         (((a)[4]) == 0xFF) &&  \
-         (((a)[5]) == 0xFF) &&  \
-         (((a)[6]) == 0xFF) &&  \
-         (((a)[7]) == 0xFF))
+/* Maximum worst case IPHC header buffer size */
+#define LOWPAN_IPHC_MAX_HC_BUF_LEN      (sizeof(struct ipv6hdr) +       \
+                                         LOWPAN_IPHC_MAX_HEADER_LEN +   \
+                                         LOWPAN_NHC_MAX_HDR_LEN)
 
 #define LOWPAN_DISPATCH_IPV6            0x41 /* 01000001 = 65 */
 #define LOWPAN_DISPATCH_IPHC            0x60 /* 011xxxxx = ... */
@@ -150,69 +88,6 @@ static inline bool lowpan_is_iphc(u8 dispatch)
         return (dispatch & LOWPAN_DISPATCH_IPHC_MASK) == LOWPAN_DISPATCH_IPHC;
 }
 
-#define LOWPAN_FRAG_TIMEOUT     (HZ * 60)       /* time-out 60 sec */
-
-#define LOWPAN_FRAG1_HEAD_SIZE  0x4
-#define LOWPAN_FRAGN_HEAD_SIZE  0x5
-
-/*
- * Values of fields within the IPHC encoding first byte
- * (C stands for compressed and I for inline)
- */
-#define LOWPAN_IPHC_TF          0x18
-
-#define LOWPAN_IPHC_FL_C        0x10
-#define LOWPAN_IPHC_TC_C        0x08
-#define LOWPAN_IPHC_NH_C        0x04
-#define LOWPAN_IPHC_TTL_1       0x01
-#define LOWPAN_IPHC_TTL_64      0x02
-#define LOWPAN_IPHC_TTL_255     0x03
-#define LOWPAN_IPHC_TTL_I       0x00
-
-
-/* Values of fields within the IPHC encoding second byte */
-#define LOWPAN_IPHC_CID         0x80
-
-#define LOWPAN_IPHC_ADDR_00     0x00
-#define LOWPAN_IPHC_ADDR_01     0x01
-#define LOWPAN_IPHC_ADDR_02     0x02
-#define LOWPAN_IPHC_ADDR_03     0x03
-
-#define LOWPAN_IPHC_SAC         0x40
-#define LOWPAN_IPHC_SAM         0x30
-
-#define LOWPAN_IPHC_SAM_BIT     4
-
-#define LOWPAN_IPHC_M           0x08
-#define LOWPAN_IPHC_DAC         0x04
-#define LOWPAN_IPHC_DAM_00      0x00
-#define LOWPAN_IPHC_DAM_01      0x01
-#define LOWPAN_IPHC_DAM_10      0x02
-#define LOWPAN_IPHC_DAM_11      0x03
-
-#define LOWPAN_IPHC_DAM_BIT     0
-/*
- * LOWPAN_UDP encoding (works together with IPHC)
- */
-#define LOWPAN_NHC_UDP_MASK             0xF8
-#define LOWPAN_NHC_UDP_ID               0xF0
-#define LOWPAN_NHC_UDP_CHECKSUMC        0x04
-#define LOWPAN_NHC_UDP_CHECKSUMI        0x00
-
-#define LOWPAN_NHC_UDP_4BIT_PORT        0xF0B0
-#define LOWPAN_NHC_UDP_4BIT_MASK        0xFFF0
-#define LOWPAN_NHC_UDP_8BIT_PORT        0xF000
-#define LOWPAN_NHC_UDP_8BIT_MASK        0xFF00
-
-/* values for port compression, _with checksum_ ie bit 5 set to 0 */
-#define LOWPAN_NHC_UDP_CS_P_00  0xF0 /* all inline */
-#define LOWPAN_NHC_UDP_CS_P_01  0xF1 /* source 16bit inline,
-                                        dest = 0xF0 + 8 bit inline */
-#define LOWPAN_NHC_UDP_CS_P_10  0xF2 /* source = 0xF0 + 8bit inline,
-                                        dest = 16 bit inline */
-#define LOWPAN_NHC_UDP_CS_P_11  0xF3 /* source & dest = 0xF0B + 4bit inline */
-#define LOWPAN_NHC_UDP_CS_C     0x04 /* checksum elided */
-
 #define LOWPAN_PRIV_SIZE(llpriv_size)   \
         (sizeof(struct lowpan_priv) + llpriv_size)
 
@@ -250,7 +125,7 @@ struct lowpan_802154_cb *lowpan_802154_cb(const struct sk_buff *skb)
 #ifdef DEBUG
 /* print data in line */
 static inline void raw_dump_inline(const char *caller, char *msg,
-                                   unsigned char *buf, int len)
+                                   const unsigned char *buf, int len)
 {
         if (msg)
                 pr_debug("%s():%s: ", caller, msg);
@@ -265,7 +140,7 @@ static inline void raw_dump_inline(const char *caller, char *msg,
  * ...
  */
 static inline void raw_dump_table(const char *caller, char *msg,
-                                  unsigned char *buf, int len)
+                                  const unsigned char *buf, int len)
 {
         if (msg)
                 pr_debug("%s():%s:\n", caller, msg);
@@ -274,24 +149,25 @@ static inline void raw_dump_table(const char *caller, char *msg,
 }
 #else
 static inline void raw_dump_table(const char *caller, char *msg,
-                                  unsigned char *buf, int len) { }
+                                  const unsigned char *buf, int len) { }
 static inline void raw_dump_inline(const char *caller, char *msg,
-                                   unsigned char *buf, int len) { }
+                                   const unsigned char *buf, int len) { }
 #endif
 
-static inline int lowpan_fetch_skb_u8(struct sk_buff *skb, u8 *val)
-{
-        if (unlikely(!pskb_may_pull(skb, 1)))
-                return -EINVAL;
-
-        *val = skb->data[0];
-        skb_pull(skb, 1);
-
-        return 0;
-}
-
-static inline bool lowpan_fetch_skb(struct sk_buff *skb,
-                void *data, const unsigned int len)
+/**
+ * lowpan_fetch_skb - getting inline data from 6LoWPAN header
+ *
+ * This function will pull data from sk buffer and put it into data to
+ * remove the 6LoWPAN inline data. This function returns true if the
+ * sk buffer is too small to pull the amount of data which is specified
+ * by len.
+ *
+ * @skb: the buffer where the inline data should be pulled from.
+ * @data: destination buffer for the inline data.
+ * @len: amount of data which should be pulled in bytes.
+ */
+static inline bool lowpan_fetch_skb(struct sk_buff *skb, void *data,
+                                    unsigned int len)
 {
         if (unlikely(!pskb_may_pull(skb, len)))
                 return true;
@@ -311,14 +187,42 @@ static inline void lowpan_push_hc_data(u8 **hc_ptr, const void *data,
 
 void lowpan_netdev_setup(struct net_device *dev, enum lowpan_lltypes lltype);
 
-int
-lowpan_header_decompress(struct sk_buff *skb, struct net_device *dev,
-                         const u8 *saddr, const u8 saddr_type,
-                         const u8 saddr_len, const u8 *daddr,
-                         const u8 daddr_type, const u8 daddr_len,
-                         u8 iphc0, u8 iphc1);
-int lowpan_header_compress(struct sk_buff *skb, struct net_device *dev,
-                        unsigned short type, const void *_daddr,
-                        const void *_saddr, unsigned int len);
+/**
+ * lowpan_header_decompress - replace 6LoWPAN header with IPv6 header
+ *
+ * This function replaces the IPHC 6LoWPAN header which should be pointed at
+ * skb->data and skb_network_header, with the IPv6 header.
+ * It would be nice that the caller have the necessary headroom of IPv6 header
+ * and greatest Transport layer header, this would reduce the overhead for
+ * reallocate headroom.
+ *
+ * @skb: the buffer which should be manipulate.
+ * @dev: the lowpan net device pointer.
+ * @daddr: destination lladdr of mac header which is used for compression
+ *      methods.
+ * @saddr: source lladdr of mac header which is used for compression
+ *      methods.
+ */
+int lowpan_header_decompress(struct sk_buff *skb, const struct net_device *dev,
+                             const void *daddr, const void *saddr);
+
+/**
+ * lowpan_header_compress - replace IPv6 header with 6LoWPAN header
+ *
+ * This function replaces the IPv6 header which should be pointed at
+ * skb->data and skb_network_header, with the IPHC 6LoWPAN header.
+ * The caller need to be sure that the sk buffer is not shared and at have
+ * at least a headroom which is smaller or equal LOWPAN_IPHC_MAX_HEADER_LEN,
+ * which is the IPHC "more bytes than IPv6 header" at worst case.
+ *
+ * @skb: the buffer which should be manipulate.
+ * @dev: the lowpan net device pointer.
+ * @daddr: destination lladdr of mac header which is used for compression
+ *      methods.
+ * @saddr: source lladdr of mac header which is used for compression
+ *      methods.
+ */
+int lowpan_header_compress(struct sk_buff *skb, const struct net_device *dev,
+                           const void *daddr, const void *saddr);
 
 #endif /* __6LOWPAN_H__ */
diff --git a/include/net/bluetooth/hci.h b/include/net/bluetooth/hci.h
index a26ff28ca878..0205b80cc90b 100644
--- a/include/net/bluetooth/hci.h
+++ b/include/net/bluetooth/hci.h
@@ -46,6 +46,7 @@
 #define HCI_DEV_RESUME                  6
 #define HCI_DEV_OPEN                    7
 #define HCI_DEV_CLOSE                   8
+#define HCI_DEV_SETUP                   9
 
 /* HCI notify events */
 #define HCI_NOTIFY_CONN_ADD             1
@@ -170,6 +171,15 @@ enum {
          * during the hdev->setup vendor callback.
          */
         HCI_QUIRK_SIMULTANEOUS_DISCOVERY,
+
+        /* When this quirk is set, the enabling of diagnostic mode is
+         * not persistent over HCI Reset. Every time the controller
+         * is brought up it needs to be reprogrammed.
+         *
+         * This quirk can be set before hci_register_dev is called or
+         * during the hdev->setup vendor callback.
+         */
+        HCI_QUIRK_NON_PERSISTENT_DIAG,
 };
 
 /* HCI device flags */
diff --git a/include/net/bluetooth/hci_core.h b/include/net/bluetooth/hci_core.h
index f28470e59682..1878d0a96333 100644
--- a/include/net/bluetooth/hci_core.h
+++ b/include/net/bluetooth/hci_core.h
@@ -398,6 +398,7 @@ struct hci_dev {
         int (*send)(struct hci_dev *hdev, struct sk_buff *skb);
         void (*notify)(struct hci_dev *hdev, unsigned int evt);
         void (*hw_error)(struct hci_dev *hdev, u8 code);
+        int (*post_init)(struct hci_dev *hdev);
         int (*set_diag)(struct hci_dev *hdev, bool enable);
         int (*set_bdaddr)(struct hci_dev *hdev, const bdaddr_t *bdaddr);
 };
@@ -470,6 +471,7 @@ struct hci_conn {
         struct delayed_work auto_accept_work;
         struct delayed_work idle_work;
         struct delayed_work le_conn_timeout;
+        struct work_struct  le_scan_cleanup;
 
         struct device   dev;
         struct dentry   *debugfs;
@@ -792,6 +794,30 @@ static inline struct hci_conn *hci_conn_hash_lookup_ba(struct hci_dev *hdev,
         return NULL;
 }
 
+static inline struct hci_conn *hci_conn_hash_lookup_le(struct hci_dev *hdev,
+                                                       bdaddr_t *ba,
+                                                       __u8 ba_type)
+{
+        struct hci_conn_hash *h = &hdev->conn_hash;
+        struct hci_conn  *c;
+
+        rcu_read_lock();
+
+        list_for_each_entry_rcu(c, &h->list, list) {
+                if (c->type != LE_LINK)
+                       continue;
+
+                if (ba_type == c->dst_type && !bacmp(&c->dst, ba)) {
+                        rcu_read_unlock();
+                        return c;
+                }
+        }
+
+        rcu_read_unlock();
+
+        return NULL;
+}
+
 static inline struct hci_conn *hci_conn_hash_lookup_state(struct hci_dev *hdev,
                                                         __u8 type, __u16 state)
 {
@@ -1016,9 +1042,6 @@ void hci_conn_params_clear_disabled(struct hci_dev *hdev);
 struct hci_conn_params *hci_pend_le_action_lookup(struct list_head *list,
                                                   bdaddr_t *addr,
                                                   u8 addr_type);
-struct hci_conn_params *hci_explicit_connect_lookup(struct hci_dev *hdev,
-                                                    bdaddr_t *addr,
-                                                    u8 addr_type);
 
 void hci_uuids_clear(struct hci_dev *hdev);
 
@@ -1458,7 +1481,7 @@ void mgmt_remote_name(struct hci_dev *hdev, bdaddr_t *bdaddr, u8 link_type,
 void mgmt_discovering(struct hci_dev *hdev, u8 discovering);
 bool mgmt_powering_down(struct hci_dev *hdev);
 void mgmt_new_ltk(struct hci_dev *hdev, struct smp_ltk *key, bool persistent);
-void mgmt_new_irk(struct hci_dev *hdev, struct smp_irk *irk);
+void mgmt_new_irk(struct hci_dev *hdev, struct smp_irk *irk, bool persistent);
 void mgmt_new_csrk(struct hci_dev *hdev, struct smp_csrk *csrk,
                    bool persistent);
 void mgmt_new_conn_param(struct hci_dev *hdev, bdaddr_t *bdaddr,
diff --git a/include/net/mac802154.h b/include/net/mac802154.h
index 5718765cbd95..da574bbdc333 100644
--- a/include/net/mac802154.h
+++ b/include/net/mac802154.h
@@ -277,6 +277,16 @@ static inline void ieee802154_le64_to_be64(void *be64_dst, const void *le64_src)
 }
 
 /**
+ * ieee802154_le16_to_be16 - copies and convert le16 to be16
+ * @be16_dst: be16 destination pointer
+ * @le16_src: le16 source pointer
+ */
+static inline void ieee802154_le16_to_be16(void *be16_dst, const void *le16_src)
+{
+        __put_unaligned_memmove16(swab16p(le16_src), be16_dst);
+}
+
+/**
  * ieee802154_alloc_hw - Allocate a new hardware device
  *
  * This must be called once for each hardware device. The returned pointer