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

3 files changed, 33 insertions, 2 deletions

diff --git a/net/ieee802154/af_ieee802154.c b/net/ieee802154/af_ieee802154.c
index 6df6ecf49708..40e606f3788f 100644
--- a/net/ieee802154/af_ieee802154.c
+++ b/net/ieee802154/af_ieee802154.c
@@ -302,7 +302,7 @@ static int ieee802154_rcv(struct sk_buff *skb, struct net_device *dev,
         struct packet_type *pt, struct net_device *orig_dev)
 {
         if (!netif_running(dev))
-                return -ENODEV;
+                goto drop;
         pr_debug("got frame, type %d, dev %p\n", dev->type, dev);
 #ifdef DEBUG
         print_hex_dump_bytes("ieee802154_rcv ", DUMP_PREFIX_NONE, skb->data, skb->len);
diff --git a/net/ieee802154/dgram.c b/net/ieee802154/dgram.c
index 1a3334c2609a..faecf648123f 100644
--- a/net/ieee802154/dgram.c
+++ b/net/ieee802154/dgram.c
@@ -1,5 +1,5 @@
 /*
- * ZigBee socket interface
+ * IEEE 802.15.4 dgram socket interface
  *
  * Copyright 2007, 2008 Siemens AG
  *
diff --git a/net/ieee802154/nl-phy.c b/net/ieee802154/nl-phy.c
index 02548b292b53..c64a38d57aa3 100644
--- a/net/ieee802154/nl-phy.c
+++ b/net/ieee802154/nl-phy.c
@@ -24,6 +24,7 @@
 
 #include <linux/kernel.h>
 #include <linux/slab.h>
+#include <linux/if_arp.h>
 #include <net/netlink.h>
 #include <net/genetlink.h>
 #include <net/wpan-phy.h>
@@ -213,12 +214,37 @@ static int ieee802154_add_iface(struct sk_buff *skb,
                 goto nla_put_failure;
         }
 
+        if (info->attrs[IEEE802154_ATTR_HW_ADDR] &&
+            nla_len(info->attrs[IEEE802154_ATTR_HW_ADDR]) !=
+                        IEEE802154_ADDR_LEN) {
+                rc = -EINVAL;
+                goto nla_put_failure;
+        }
+
         dev = phy->add_iface(phy, devname);
         if (IS_ERR(dev)) {
                 rc = PTR_ERR(dev);
                 goto nla_put_failure;
         }
 
+        if (info->attrs[IEEE802154_ATTR_HW_ADDR]) {
+                struct sockaddr addr;
+
+                addr.sa_family = ARPHRD_IEEE802154;
+                nla_memcpy(&addr.sa_data, info->attrs[IEEE802154_ATTR_HW_ADDR],
+                                IEEE802154_ADDR_LEN);
+
+                /*
+                 * strangely enough, some callbacks (inetdev_event) from
+                 * dev_set_mac_address require RTNL_LOCK
+                 */
+                rtnl_lock();
+                rc = dev_set_mac_address(dev, &addr);
+                rtnl_unlock();
+                if (rc)
+                        goto dev_unregister;
+        }
+
         NLA_PUT_STRING(msg, IEEE802154_ATTR_PHY_NAME, wpan_phy_name(phy));
         NLA_PUT_STRING(msg, IEEE802154_ATTR_DEV_NAME, dev->name);
 
@@ -228,6 +254,11 @@ static int ieee802154_add_iface(struct sk_buff *skb,
 
         return ieee802154_nl_reply(msg, info);
 
+dev_unregister:
+        rtnl_lock(); /* del_iface must be called with RTNL lock */
+        phy->del_iface(phy, dev);
+        dev_put(dev);
+        rtnl_unlock();
 nla_put_failure:
         nlmsg_free(msg);
 out_dev: