Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 673692fa authored by Alexander Aring's avatar Alexander Aring Committed by Marcel Holtmann
Browse files

ieee802154: move validation check out of softmac 



This patch moves the value validation out of softmac layer. We need
to be sure now that this value is accepted by the transceiver/mac802154 or
"possible" hardmac drivers before calling rdev-ops.

Signed-off-by: default avatarAlexander Aring <alex.aring@gmail.com>
Signed-off-by: default avatarMarcel Holtmann <marcel@holtmann.org>
parent 0cf0879a

net/ieee802154/nl802154.c

+27 −1
Original line number Diff line number Diff line
@@ -625,7 +625,8 @@ static int nl802154_set_channel(struct sk_buff *skb, struct genl_info *info) 
	channel = nla_get_u8(info->attrs[NL802154_ATTR_CHANNEL]);



	/* check 802.15.4 constraints */

	if (page > IEEE802154_MAX_PAGE || channel > IEEE802154_MAX_CHANNEL)

	if (page > IEEE802154_MAX_PAGE || channel > IEEE802154_MAX_CHANNEL ||

	    !(rdev->wpan_phy.channels_supported[page] & BIT(channel)))

		return -EINVAL;



	return rdev_set_channel(rdev, page, channel);
@@ -674,6 +675,16 @@ static int nl802154_set_pan_id(struct sk_buff *skb, struct genl_info *info) 


	pan_id = nla_get_le16(info->attrs[NL802154_ATTR_PAN_ID]);



	/* TODO

	 * I am not sure about to check here on broadcast pan_id.

	 * Broadcast is a valid setting, comment from 802.15.4:

	 * If this value is 0xffff, the device is not associated.

	 *

	 * This could useful to simple deassociate an device.

	 */

	if (pan_id == cpu_to_le16(IEEE802154_PAN_ID_BROADCAST))

		return -EINVAL;



	return rdev_set_pan_id(rdev, wpan_dev, pan_id);

}
@@ -695,6 +706,21 @@ static int nl802154_set_short_addr(struct sk_buff *skb, struct genl_info *info) 


	short_addr = nla_get_le16(info->attrs[NL802154_ATTR_SHORT_ADDR]);



	/* TODO

	 * I am not sure about to check here on broadcast short_addr.

	 * Broadcast is a valid setting, comment from 802.15.4:

	 * A value of 0xfffe indicates that the device has

	 * associated but has not been allocated an address. A

	 * value of 0xffff indicates that the device does not

	 * have a short address.

	 *

	 * I think we should allow to set these settings but

	 * don't allow to allow socket communication with it.

	 */

	if (short_addr == cpu_to_le16(IEEE802154_ADDR_SHORT_UNSPEC) ||

	    short_addr == cpu_to_le16(IEEE802154_ADDR_SHORT_BROADCAST))

		return -EINVAL;



	return rdev_set_short_addr(rdev, wpan_dev, short_addr);

}

net/mac802154/cfg.c

+0 −29
Original line number Diff line number Diff line
@@ -73,10 +73,6 @@ ieee802154_set_channel(struct wpan_phy *wpan_phy, u8 page, u8 channel) 


	ASSERT_RTNL();



	/* check if phy support this setting */

	if (!(wpan_phy->channels_supported[page] & BIT(channel)))

		return -EINVAL;



	ret = drv_set_channel(local, page, channel);

	if (!ret) {

		wpan_phy->current_page = page;
@@ -112,16 +108,6 @@ ieee802154_set_pan_id(struct wpan_phy *wpan_phy, struct wpan_dev *wpan_dev, 
{

	ASSERT_RTNL();



	/* TODO

	 * I am not sure about to check here on broadcast pan_id.

	 * Broadcast is a valid setting, comment from 802.15.4:

	 * If this value is 0xffff, the device is not associated.

	 *

	 * This could useful to simple deassociate an device.

	 */

	if (pan_id == cpu_to_le16(IEEE802154_PAN_ID_BROADCAST))

		return -EINVAL;



	wpan_dev->pan_id = pan_id;

	return 0;

}
@@ -149,21 +135,6 @@ ieee802154_set_short_addr(struct wpan_phy *wpan_phy, struct wpan_dev *wpan_dev, 
{

	ASSERT_RTNL();



	/* TODO

	 * I am not sure about to check here on broadcast short_addr.

	 * Broadcast is a valid setting, comment from 802.15.4:

	 * A value of 0xfffe indicates that the device has

	 * associated but has not been allocated an address. A

	 * value of 0xffff indicates that the device does not

	 * have a short address.

	 *

	 * I think we should allow to set these settings but

	 * don't allow to allow socket communication with it.

	 */

	if (short_addr == cpu_to_le16(IEEE802154_ADDR_SHORT_UNSPEC) ||

	    short_addr == cpu_to_le16(IEEE802154_ADDR_SHORT_BROADCAST))

		return -EINVAL;



	wpan_dev->short_addr = short_addr;

	return 0;

}