ieee802154: add iftypes capability

This patch adds capability flags for supported interface types.

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

diff --git a/include/net/cfg802154.h b/include/net/cfg802154.h
index a12c6c5247e97fb2e8a17729cbf5db11d064fc60..11bbf17ad865d710d07c5b0974ba53ed79c50d45 100644 (file)
--- a/include/net/cfg802154.h
+++ b/include/net/cfg802154.h
@@ -80,7 +80,7 @@ wpan_phy_supported_bool(bool b, enum nl802154_supported_bool_states st)
 
 struct wpan_phy_supported {
        u32 channels[IEEE802154_MAX_PAGE + 1],
-           cca_modes, cca_opts;
+           cca_modes, cca_opts, iftypes;
        enum nl802154_supported_bool_states lbt;
        u8 min_minbe, max_minbe, min_maxbe, max_maxbe,
           min_csma_backoffs, max_csma_backoffs;

diff --git a/net/ieee802154/nl802154.c b/net/ieee802154/nl802154.c
index 40fb0be009b285a8c767b3ff8909db343d8d647d..3afb20e43ff80c6b061789f5f0de8a103c1d7f2e 100644 (file)
--- a/net/ieee802154/nl802154.c
+++ b/net/ieee802154/nl802154.c
@@ -579,7 +579,8 @@ static int nl802154_new_interface(struct sk_buff *skb, struct genl_info *info)
 
        if (info->attrs[NL802154_ATTR_IFTYPE]) {
                type = nla_get_u32(info->attrs[NL802154_ATTR_IFTYPE]);
-               if (type > NL802154_IFTYPE_MAX)
+               if (type > NL802154_IFTYPE_MAX ||
+                   !(rdev->wpan_phy.supported.iftypes & BIT(type)))
                        return -EINVAL;
        }
 

diff --git a/net/mac802154/main.c b/net/mac802154/main.c
index ddcd6ff8d39c26990a9e1a5224637be9106b2cf0..356b346e1ee86fdeadebf7be5d318c70dbc0d969 100644 (file)
--- a/net/mac802154/main.c
+++ b/net/mac802154/main.c
@@ -116,6 +116,9 @@ ieee802154_alloc_hw(size_t priv_data_len, const struct ieee802154_ops *ops)
        phy->supported.max_csma_backoffs = 5;
        phy->supported.lbt = NL802154_SUPPORTED_BOOL_FALSE;
 
+       /* always supported */
+       phy->supported.iftypes = BIT(NL802154_IFTYPE_NODE);
+
        return &local->hw;
 }
 EXPORT_SYMBOL(ieee802154_alloc_hw);
@@ -181,6 +184,9 @@ int ieee802154_register_hw(struct ieee802154_hw *hw)
                local->phy->supported.max_frame_retries = -1;
        }
 
+       if (hw->flags & IEEE802154_HW_PROMISCUOUS)
+               local->phy->supported.iftypes |= BIT(NL802154_IFTYPE_MONITOR);
+
        rc = wpan_phy_register(local->phy);
        if (rc < 0)
                goto out_wq;