Merge tag 'master-2014-10-02' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next

John W. Linville says:

====================
pull request: wireless-next 2014-10-03

Please pull tihs batch of updates intended for the 3.18 stream!

For the iwlwifi bits, Emmanuel says:

"I have here a few things that depend on the latest mac80211's changes:
RRM, TPC, Quiet Period etc...  Eyal keeps improving our rate control
and we have a new device ID. This last patch should probably have
gone to wireless.git, but at that stage, I preferred to send it to
-next and CC stable."

For (most of) the Atheros bits, Kalle says:

"The only new feature is testmode support from me. Ben added a new method
to crash the firmware with an assert for debug purposes. As usual, we
have lots of smaller fixes from Michal. Matteo fixed a Kconfig
dependency with debugfs. I fixed some warnings recently added to
checkpatch."

For the NFC bits, Samuel says:

"We've had major updates for TI and ST Microelectronics drivers, and a
few NCI related changes.

For TI's trf7970a driver:

- Target mode support for trf7970a
- Suspend/resume support for trf7970a
- DT properties additions to handle different quirks
- A bunch of fixes for smartphone IOP related issues

For ST Microelectronics' ST21NFCA and ST21NFCB drivers:

- ISO15693 support for st21nfcb
- checkpatch and sparse related warning fixes
- Code cleanups and a few minor fixes

Finally, Marvell added ISO15693 support to the NCI stack, together with a
couple of NCI fixes."

For the Bluetooth bits, Johan says:

"This 3.18 pull request replaces the one I did on Monday ("bluetooth-next
2014-09-22", which hasn't been pulled yet). The additions since the last
request are:

 - SCO connection fix for devices not supporting eSCO
 - Cleanups regarding the SCO establishment logic
 - Remove unnecessary return value from logging functions
 - Header compression fix for 6lowpan
 - Cleanups to the ieee802154/mrf24j40 driver

Here's a copy from previous request that this one replaces:

'
Here are some more patches for 3.18. They include various fixes to the
btusb HCI driver, a fix for LE SMP, as well as adding Jukka to the
MAINTAINERS file for generic 6LoWPAN (as requested by Alexander Aring).

I've held on to this pull request a bit since we were waiting for a SCO
related fix to get sorted out first. However, since the merge window is
getting closer I decided not to wait for it. If we do get the fix sorted
out there'll probably be a second small pull request later this week.
'"

And,

"Unless 3.17 gets delayed this will probably be our last -next pull request for
3.18. We've got:

  - New Marvell hardware supportr
  - Multicast support for 6lowpan
  - Several of 6lowpan fixes & cleanups
  - Fix for a (false-positive) lockdep warning in L2CAP
  - Minor btusb cleanup"

On top of all that comes the usual sort of updates to ath5k, ath9k,
ath10k, brcmfmac, mwifiex, and wil6210.  This time around there are
also a number of rtlwifi updates to enable some new hardware and
to reconcile the in-kernel drivers with some newer releases of the
Realtek vendor drivers.  Also of note is some device tree work for
the bcma bus.

Please let me know if there are problems!
====================

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

1 files changed, 89 insertions, 36 deletions

diff --git a/net/ieee802154/6lowpan_rtnl.c b/net/ieee802154/6lowpan_rtnl.c
index 5e788cdc499a..44136297b673 100644
--- a/net/ieee802154/6lowpan_rtnl.c
+++ b/net/ieee802154/6lowpan_rtnl.c
@@ -71,20 +71,42 @@ struct lowpan_dev_record {
         struct list_head list;
 };
 
+/* don't save pan id, it's intra pan */
+struct lowpan_addr {
+        u8 mode;
+        union {
+                /* IPv6 needs big endian here */
+                __be64 extended_addr;
+                __be16 short_addr;
+        } u;
+};
+
+struct lowpan_addr_info {
+        struct lowpan_addr daddr;
+        struct lowpan_addr saddr;
+};
+
 static inline struct
 lowpan_dev_info *lowpan_dev_info(const struct net_device *dev)
 {
         return netdev_priv(dev);
 }
 
+static inline struct
+lowpan_addr_info *lowpan_skb_priv(const struct sk_buff *skb)
+{
+        WARN_ON_ONCE(skb_headroom(skb) < sizeof(struct lowpan_addr_info));
+        return (struct lowpan_addr_info *)(skb->data -
+                        sizeof(struct lowpan_addr_info));
+}
+
 static int lowpan_header_create(struct sk_buff *skb, struct net_device *dev,
                                 unsigned short type, const void *_daddr,
                                 const void *_saddr, unsigned int len)
 {
         const u8 *saddr = _saddr;
         const u8 *daddr = _daddr;
-        struct ieee802154_addr sa, da;
-        struct ieee802154_mac_cb *cb = mac_cb_init(skb);
+        struct lowpan_addr_info *info;
 
         /* TODO:
          * if this package isn't ipv6 one, where should it be routed?
@@ -98,41 +120,17 @@ static int lowpan_header_create(struct sk_buff *skb, struct net_device *dev,
         raw_dump_inline(__func__, "saddr", (unsigned char *)saddr, 8);
         raw_dump_inline(__func__, "daddr", (unsigned char *)daddr, 8);
 
-        lowpan_header_compress(skb, dev, type, daddr, saddr, len);
-
-        /* NOTE1: I'm still unsure about the fact that compression and WPAN
-         * header are created here and not later in the xmit. So wait for
-         * an opinion of net maintainers.
-         */
-        /* NOTE2: to be absolutely correct, we must derive PANid information
-         * from MAC subif of the 'dev' and 'real_dev' network devices, but
-         * this isn't implemented in mainline yet, so currently we assign 0xff
-         */
-        cb->type = IEEE802154_FC_TYPE_DATA;
-
-        /* prepare wpan address data */
-        sa.mode = IEEE802154_ADDR_LONG;
-        sa.pan_id = ieee802154_mlme_ops(dev)->get_pan_id(dev);
-        sa.extended_addr = ieee802154_devaddr_from_raw(saddr);
-
-        /* intra-PAN communications */
-        da.pan_id = sa.pan_id;
-
-        /* if the destination address is the broadcast address, use the
-         * corresponding short address
-         */
-        if (lowpan_is_addr_broadcast(daddr)) {
-                da.mode = IEEE802154_ADDR_SHORT;
-                da.short_addr = cpu_to_le16(IEEE802154_ADDR_BROADCAST);
-        } else {
-                da.mode = IEEE802154_ADDR_LONG;
-                da.extended_addr = ieee802154_devaddr_from_raw(daddr);
-        }
+        info = lowpan_skb_priv(skb);
 
-        cb->ackreq = !lowpan_is_addr_broadcast(daddr);
+        /* TODO: Currently we only support extended_addr */
+        info->daddr.mode = IEEE802154_ADDR_LONG;
+        memcpy(&info->daddr.u.extended_addr, daddr,
+               sizeof(info->daddr.u.extended_addr));
+        info->saddr.mode = IEEE802154_ADDR_LONG;
+        memcpy(&info->saddr.u.extended_addr, saddr,
+               sizeof(info->daddr.u.extended_addr));
 
-        return dev_hard_header(skb, lowpan_dev_info(dev)->real_dev,
-                        type, (void *)&da, (void *)&sa, 0);
+        return 0;
 }
 
 static int lowpan_give_skb_to_devices(struct sk_buff *skb,
@@ -330,13 +328,68 @@ err:
         return rc;
 }
 
+static int lowpan_header(struct sk_buff *skb, struct net_device *dev)
+{
+        struct ieee802154_addr sa, da;
+        struct ieee802154_mac_cb *cb = mac_cb_init(skb);
+        struct lowpan_addr_info info;
+        void *daddr, *saddr;
+
+        memcpy(&info, lowpan_skb_priv(skb), sizeof(info));
+
+        /* TODO: Currently we only support extended_addr */
+        daddr = &info.daddr.u.extended_addr;
+        saddr = &info.saddr.u.extended_addr;
+
+        lowpan_header_compress(skb, dev, ETH_P_IPV6, daddr, saddr, skb->len);
+
+        cb->type = IEEE802154_FC_TYPE_DATA;
+
+        /* prepare wpan address data */
+        sa.mode = IEEE802154_ADDR_LONG;
+        sa.pan_id = ieee802154_mlme_ops(dev)->get_pan_id(dev);
+        sa.extended_addr = ieee802154_devaddr_from_raw(saddr);
+
+        /* intra-PAN communications */
+        da.pan_id = sa.pan_id;
+
+        /* if the destination address is the broadcast address, use the
+         * corresponding short address
+         */
+        if (lowpan_is_addr_broadcast((const u8 *)daddr)) {
+                da.mode = IEEE802154_ADDR_SHORT;
+                da.short_addr = cpu_to_le16(IEEE802154_ADDR_BROADCAST);
+                cb->ackreq = false;
+        } else {
+                da.mode = IEEE802154_ADDR_LONG;
+                da.extended_addr = ieee802154_devaddr_from_raw(daddr);
+                cb->ackreq = true;
+        }
+
+        return dev_hard_header(skb, lowpan_dev_info(dev)->real_dev,
+                        ETH_P_IPV6, (void *)&da, (void *)&sa, 0);
+}
+
 static netdev_tx_t lowpan_xmit(struct sk_buff *skb, struct net_device *dev)
 {
         struct ieee802154_hdr wpan_hdr;
-        int max_single;
+        int max_single, ret;
 
         pr_debug("package xmit\n");
 
+        /* We must take a copy of the skb before we modify/replace the ipv6
+         * header as the header could be used elsewhere
+         */
+        skb = skb_unshare(skb, GFP_ATOMIC);
+        if (!skb)
+                return NET_XMIT_DROP;
+
+        ret = lowpan_header(skb, dev);
+        if (ret < 0) {
+                kfree_skb(skb);
+                return NET_XMIT_DROP;
+        }
+
         if (ieee802154_hdr_peek(skb, &wpan_hdr) < 0) {
                 kfree_skb(skb);
                 return NET_XMIT_DROP;