ieee802154: rename and move WPAN_NUM_ defines

This patch moves the 802.15.4 constraints WPAN_NUM_ defines into
"net/ieee802154.h" which should contain all necessary 802.15.4 related
information. Also rename these defines to a common name which is
IEEE802154_MAX_CHANNEL and IEEE802154_MAX_PAGE.

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

1 files changed, 2 insertions, 2 deletions

diff --git a/net/ieee802154/nl802154.c b/net/ieee802154/nl802154.c
index 6b9bc93944a6..b82b01669a67 100644
--- a/net/ieee802154/nl802154.c
+++ b/net/ieee802154/nl802154.c
@@ -245,7 +245,7 @@ nl802154_send_wpan_phy_channels(struct cfg802154_registered_device *rdev,
         if (!nl_page)
                 return -ENOBUFS;
 
-        for (page = 0; page < WPAN_NUM_PAGES; page++) {
+        for (page = 0; page <= IEEE802154_MAX_PAGE; page++) {
                 if (nla_put_u32(msg, NL802154_ATTR_SUPPORTED_CHANNEL,
                                 rdev->wpan_phy.channels_supported[page]))
                         return -ENOBUFS;
@@ -616,7 +616,7 @@ 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 >= WPAN_NUM_PAGES || channel >= WPAN_NUM_CHANNELS)
+        if (page > IEEE802154_MAX_PAGE || channel > IEEE802154_MAX_CHANNEL)
                 return -EINVAL;
 
         return rdev_set_channel(rdev, page, channel);