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: Alexander Aring <alex.aring@gmail.com>
Signed-off-by: Marcel Holtmann <marcel@holtmann.org>

diff --git a/net/ieee802154/nl802154.c b/net/ieee802154/nl802154.c
index c01f4bbe7c7cadc18d28fadede6354ebb3c88587..d750d9778ba7eaad5667b077cf8bb732eb0136ae 100644 (file)
--- a/net/ieee802154/nl802154.c
+++ b/net/ieee802154/nl802154.c
@@ -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);
 }
 

diff --git a/net/mac802154/cfg.c b/net/mac802154/cfg.c
index 70be9c799f8a81596a4e753b239849549d792dd0..c63601582c71c3d482afab3d25bbc7bfe4de0b10 100644 (file)
--- a/net/mac802154/cfg.c
+++ b/net/mac802154/cfg.c
@@ -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;
 }