Merge tag 'media/v4.7-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab...

[cascardo/linux.git] / net / ieee802154 / nl802154.c

diff --git a/net/ieee802154/nl802154.c b/net/ieee802154/nl802154.c
index 16ef0d9..ca207db 100644 (file)
--- a/net/ieee802154/nl802154.c
+++ b/net/ieee802154/nl802154.c
@@ -722,7 +722,8 @@ ieee802154_llsec_send_key_id(struct sk_buff *msg,
                        break;
                case NL802154_DEV_ADDR_EXTENDED:
                        if (nla_put_le64(msg, NL802154_DEV_ADDR_ATTR_EXTENDED,
-                                        desc->device_addr.extended_addr))
+                                        desc->device_addr.extended_addr,
+                                        NL802154_DEV_ADDR_ATTR_PAD))
                                return -ENOBUFS;
                        break;
                default:
@@ -742,7 +743,8 @@ ieee802154_llsec_send_key_id(struct sk_buff *msg,
                break;
        case NL802154_KEY_ID_MODE_INDEX_EXTENDED:
                if (nla_put_le64(msg, NL802154_KEY_ID_ATTR_SOURCE_EXTENDED,
-                                desc->extended_source))
+                                desc->extended_source,
+                                NL802154_KEY_ID_ATTR_PAD))
                        return -ENOBUFS;
                break;
        default:
@@ -811,7 +813,8 @@ nl802154_send_iface(struct sk_buff *msg, u32 portid, u32 seq, int flags,
 
        if (nla_put_u32(msg, NL802154_ATTR_WPAN_PHY, rdev->wpan_phy_idx) ||
            nla_put_u32(msg, NL802154_ATTR_IFTYPE, wpan_dev->iftype) ||
-           nla_put_u64(msg, NL802154_ATTR_WPAN_DEV, wpan_dev_id(wpan_dev)) ||
+           nla_put_u64_64bit(msg, NL802154_ATTR_WPAN_DEV,
+                             wpan_dev_id(wpan_dev), NL802154_ATTR_PAD) ||
            nla_put_u32(msg, NL802154_ATTR_GENERATION,
                        rdev->devlist_generation ^
                        (cfg802154_rdev_list_generation << 2)))
@@ -819,7 +822,8 @@ nl802154_send_iface(struct sk_buff *msg, u32 portid, u32 seq, int flags,
 
        /* address settings */
        if (nla_put_le64(msg, NL802154_ATTR_EXTENDED_ADDR,
-                        wpan_dev->extended_addr) ||
+                        wpan_dev->extended_addr,
+                        NL802154_ATTR_PAD) ||
            nla_put_le16(msg, NL802154_ATTR_SHORT_ADDR,
                         wpan_dev->short_addr) ||
            nla_put_le16(msg, NL802154_ATTR_PAN_ID, wpan_dev->pan_id))
@@ -1074,6 +1078,11 @@ static int nl802154_set_pan_id(struct sk_buff *skb, struct genl_info *info)
        if (netif_running(dev))
                return -EBUSY;
 
+       if (wpan_dev->lowpan_dev) {
+               if (netif_running(wpan_dev->lowpan_dev))
+                       return -EBUSY;
+       }
+
        /* don't change address fields on monitor */
        if (wpan_dev->iftype == NL802154_IFTYPE_MONITOR ||
            !info->attrs[NL802154_ATTR_PAN_ID])
@@ -1105,6 +1114,11 @@ static int nl802154_set_short_addr(struct sk_buff *skb, struct genl_info *info)
        if (netif_running(dev))
                return -EBUSY;
 
+       if (wpan_dev->lowpan_dev) {
+               if (netif_running(wpan_dev->lowpan_dev))
+                       return -EBUSY;
+       }
+
        /* don't change address fields on monitor */
        if (wpan_dev->iftype == NL802154_IFTYPE_MONITOR ||
            !info->attrs[NL802154_ATTR_SHORT_ADDR])
@@ -1614,7 +1628,7 @@ static int nl802154_send_device(struct sk_buff *msg, u32 cmd, u32 portid,
            nla_put_le16(msg, NL802154_DEV_ATTR_SHORT_ADDR,
                         dev_desc->short_addr) ||
            nla_put_le64(msg, NL802154_DEV_ATTR_EXTENDED_ADDR,
-                        dev_desc->hwaddr) ||
+                        dev_desc->hwaddr, NL802154_DEV_ATTR_PAD) ||
            nla_put_u8(msg, NL802154_DEV_ATTR_SECLEVEL_EXEMPT,
                       dev_desc->seclevel_exempt) ||
            nla_put_u32(msg, NL802154_DEV_ATTR_KEY_MODE, dev_desc->key_mode))
@@ -1778,7 +1792,7 @@ static int nl802154_send_devkey(struct sk_buff *msg, u32 cmd, u32 portid,
                goto nla_put_failure;
 
        if (nla_put_le64(msg, NL802154_DEVKEY_ATTR_EXTENDED_ADDR,
-                        extended_addr) ||
+                        extended_addr, NL802154_DEVKEY_ATTR_PAD) ||
            nla_put_u32(msg, NL802154_DEVKEY_ATTR_FRAME_COUNTER,
                        devkey->frame_counter))
                goto nla_put_failure;