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/mac802154 | |
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/mac802154')
-rw-r--r-- | net/mac802154/cfg.c | 26 |
1 files changed, 26 insertions, 0 deletions
diff --git a/net/mac802154/cfg.c b/net/mac802154/cfg.c index db6e5e981a83..df29976d1321 100644 --- a/net/mac802154/cfg.c +++ b/net/mac802154/cfg.c | |||
@@ -83,9 +83,35 @@ static int ieee802154_set_pan_id(struct wpan_phy *wpan_phy, | |||
83 | return 0; | 83 | return 0; |
84 | } | 84 | } |
85 | 85 | ||
86 | static int | ||
87 | ieee802154_set_short_addr(struct wpan_phy *wpan_phy, struct wpan_dev *wpan_dev, | ||
88 | const u16 short_addr) | ||
89 | { | ||
90 | ASSERT_RTNL(); | ||
91 | |||
92 | /* TODO | ||
93 | * I am not sure about to check here on broadcast short_addr. | ||
94 | * Broadcast is a valid setting, comment from 802.15.4: | ||
95 | * A value of 0xfffe indicates that the device has | ||
96 | * associated but has not been allocated an address. A | ||
97 | * value of 0xffff indicates that the device does not | ||
98 | * have a short address. | ||
99 | * | ||
100 | * I think we should allow to set these settings but | ||
101 | * don't allow to allow socket communication with it. | ||
102 | */ | ||
103 | if (short_addr == IEEE802154_ADDR_SHORT_UNSPEC || | ||
104 | short_addr == IEEE802154_ADDR_SHORT_BROADCAST) | ||
105 | return -EINVAL; | ||
106 | |||
107 | wpan_dev->short_addr = cpu_to_le16(short_addr); | ||
108 | return 0; | ||
109 | } | ||
110 | |||
86 | const struct cfg802154_ops mac802154_config_ops = { | 111 | const struct cfg802154_ops mac802154_config_ops = { |
87 | .add_virtual_intf_deprecated = ieee802154_add_iface_deprecated, | 112 | .add_virtual_intf_deprecated = ieee802154_add_iface_deprecated, |
88 | .del_virtual_intf_deprecated = ieee802154_del_iface_deprecated, | 113 | .del_virtual_intf_deprecated = ieee802154_del_iface_deprecated, |
89 | .set_channel = ieee802154_set_channel, | 114 | .set_channel = ieee802154_set_channel, |
90 | .set_pan_id = ieee802154_set_pan_id, | 115 | .set_pan_id = ieee802154_set_pan_id, |
116 | .set_short_addr = ieee802154_set_short_addr, | ||
91 | }; | 117 | }; |