diff options
author | Alexander Aring <alex.aring@gmail.com> | 2014-11-11 21:36:58 -0500 |
---|---|---|
committer | Marcel Holtmann <marcel@holtmann.org> | 2014-11-11 23:10:40 -0500 |
commit | 9830c62a0b3d57d9d00880989cfe987f581bc03f (patch) | |
tree | 730650565487cf2a9caefc85154b874b780b9bd1 /net/ieee802154/nl802154.c | |
parent | 702bf371282f5912fe53f0b247fa2d7df9d7951f (diff) |
ieee820154: add short_addr setting support
This patch adds support for setting short address via nl802154 framework.
Also added a comment because a 0xffff seems to be valid address that we
don't have a short address. This is a valid setting but we need
more checks in upper layers to don't allow this address as source address.
Also the current netlink interface doesn't allow to set the short_addr
to 0xffff. Same for the 0xfffe short address which describes a not
allocated short address.
Signed-off-by: Alexander Aring <alex.aring@gmail.com>
Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
Diffstat (limited to 'net/ieee802154/nl802154.c')
-rw-r--r-- | net/ieee802154/nl802154.c | 31 |
1 files changed, 31 insertions, 0 deletions
diff --git a/net/ieee802154/nl802154.c b/net/ieee802154/nl802154.c index 88cd1293283a..2978c1a78017 100644 --- a/net/ieee802154/nl802154.c +++ b/net/ieee802154/nl802154.c | |||
@@ -593,6 +593,29 @@ static int nl802154_set_pan_id(struct sk_buff *skb, struct genl_info *info) | |||
593 | return rdev_set_pan_id(rdev, wpan_dev, pan_id); | 593 | return rdev_set_pan_id(rdev, wpan_dev, pan_id); |
594 | } | 594 | } |
595 | 595 | ||
596 | static int nl802154_set_short_addr(struct sk_buff *skb, struct genl_info *info) | ||
597 | { | ||
598 | struct cfg802154_registered_device *rdev = info->user_ptr[0]; | ||
599 | struct net_device *dev = info->user_ptr[1]; | ||
600 | struct wpan_dev *wpan_dev = dev->ieee802154_ptr; | ||
601 | u16 short_addr; | ||
602 | |||
603 | /* conflict here while tx/rx calls */ | ||
604 | if (netif_running(dev)) | ||
605 | return -EBUSY; | ||
606 | |||
607 | /* don't change address fields on monitor */ | ||
608 | if (wpan_dev->iftype == NL802154_IFTYPE_MONITOR) | ||
609 | return -EINVAL; | ||
610 | |||
611 | if (!info->attrs[NL802154_ATTR_SHORT_ADDR]) | ||
612 | return -EINVAL; | ||
613 | |||
614 | short_addr = nla_get_u16(info->attrs[NL802154_ATTR_SHORT_ADDR]); | ||
615 | |||
616 | return rdev_set_short_addr(rdev, wpan_dev, short_addr); | ||
617 | } | ||
618 | |||
596 | #define NL802154_FLAG_NEED_WPAN_PHY 0x01 | 619 | #define NL802154_FLAG_NEED_WPAN_PHY 0x01 |
597 | #define NL802154_FLAG_NEED_NETDEV 0x02 | 620 | #define NL802154_FLAG_NEED_NETDEV 0x02 |
598 | #define NL802154_FLAG_NEED_RTNL 0x04 | 621 | #define NL802154_FLAG_NEED_RTNL 0x04 |
@@ -719,6 +742,14 @@ static const struct genl_ops nl802154_ops[] = { | |||
719 | .internal_flags = NL802154_FLAG_NEED_NETDEV | | 742 | .internal_flags = NL802154_FLAG_NEED_NETDEV | |
720 | NL802154_FLAG_NEED_RTNL, | 743 | NL802154_FLAG_NEED_RTNL, |
721 | }, | 744 | }, |
745 | { | ||
746 | .cmd = NL802154_CMD_SET_SHORT_ADDR, | ||
747 | .doit = nl802154_set_short_addr, | ||
748 | .policy = nl802154_policy, | ||
749 | .flags = GENL_ADMIN_PERM, | ||
750 | .internal_flags = NL802154_FLAG_NEED_NETDEV | | ||
751 | NL802154_FLAG_NEED_RTNL, | ||
752 | }, | ||
722 | }; | 753 | }; |
723 | 754 | ||
724 | /* initialisation/exit functions */ | 755 | /* initialisation/exit functions */ |