Merge tag 'remoteproc-3.10' of git://git.kernel.org/pub/scm/linux/kernel/git/ohad...

[firefly-linux-kernel-4.4.55.git] / net / ieee802154 / 6lowpan.c

diff --git a/net/ieee802154/6lowpan.c b/net/ieee802154/6lowpan.c
index c9c3f3d18c41c9612c333fe79288b6687ae96c4e..55e1fd5b3e56d4ede22c2a05a6f72cc3b4bffa44 100644 (file)
--- a/net/ieee802154/6lowpan.c
+++ b/net/ieee802154/6lowpan.c
@@ -104,7 +104,7 @@ static const u8 lowpan_llprefix[] = {0xfe, 0x80};
 struct lowpan_dev_info {
        struct net_device       *real_dev; /* real WPAN device ptr */
        struct mutex            dev_list_mtx; /* mutex for list ops */
-       unsigned short fragment_tag;
+       unsigned short          fragment_tag;
 };
 
 struct lowpan_dev_record {
@@ -602,7 +602,7 @@ static int lowpan_header_create(struct sk_buff *skb,
                        da.short_addr = IEEE802154_ADDR_BROADCAST;
                } else {
                        da.addr_type = IEEE802154_ADDR_LONG;
-                       memcpy(&(da.hwaddr), daddr, 8);
+                       memcpy(&(da.hwaddr), daddr, IEEE802154_ADDR_LEN);
 
                        /* request acknowledgment */
                        mac_cb(skb)->flags |= MAC_CB_FLAG_ACKREQ;
@@ -1139,10 +1139,10 @@ static netdev_tx_t lowpan_xmit(struct sk_buff *skb, struct net_device *dev)
 error:
        dev_kfree_skb(skb);
 out:
-       if (err < 0)
+       if (err)
                pr_debug("ERROR: xmit failed\n");
 
-       return (err < 0 ? NETDEV_TX_BUSY : NETDEV_TX_OK);
+       return (err < 0) ? NET_XMIT_DROP : err;
 }
 
 static struct wpan_phy *lowpan_get_phy(const struct net_device *dev)