nl802154: introduce support for cca settings

This patch adds support for setting cca parameters via nl802154.

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

2 files changed, 50 insertions, 3 deletions

diff --git a/net/ieee802154/nl802154.c b/net/ieee802154/nl802154.c
index 1efbe4250024..a25b9bbd077b 100644
--- a/net/ieee802154/nl802154.c
+++ b/net/ieee802154/nl802154.c
@@ -209,7 +209,8 @@ static const struct nla_policy nl802154_policy[NL802154_ATTR_MAX+1] = {
 
         [NL802154_ATTR_TX_POWER] = { .type = NLA_S8, },
 
-        [NL802154_ATTR_CCA_MODE] = { .type = NLA_U8, },
+        [NL802154_ATTR_CCA_MODE] = { .type = NLA_U32, },
+        [NL802154_ATTR_CCA_OPT] = { .type = NLA_U32, },
 
         [NL802154_ATTR_SUPPORTED_CHANNEL] = { .type = NLA_U32, },
 
@@ -290,10 +291,16 @@ static int nl802154_send_wpan_phy(struct cfg802154_registered_device *rdev,
                 goto nla_put_failure;
 
         /* cca mode */
-        if (nla_put_u8(msg, NL802154_ATTR_CCA_MODE,
-                       rdev->wpan_phy.cca.mode))
+        if (nla_put_u32(msg, NL802154_ATTR_CCA_MODE,
+                        rdev->wpan_phy.cca.mode))
                 goto nla_put_failure;
 
+        if (rdev->wpan_phy.cca.mode == NL802154_CCA_ENERGY_CARRIER) {
+                if (nla_put_u32(msg, NL802154_ATTR_CCA_OPT,
+                                rdev->wpan_phy.cca.opt))
+                        goto nla_put_failure;
+        }
+
         if (nla_put_s8(msg, NL802154_ATTR_TX_POWER,
                        rdev->wpan_phy.transmit_power))
                 goto nla_put_failure;
@@ -622,6 +629,31 @@ static int nl802154_set_channel(struct sk_buff *skb, struct genl_info *info)
         return rdev_set_channel(rdev, page, channel);
 }
 
+static int nl802154_set_cca_mode(struct sk_buff *skb, struct genl_info *info)
+{
+        struct cfg802154_registered_device *rdev = info->user_ptr[0];
+        struct wpan_phy_cca cca;
+
+        if (!info->attrs[NL802154_ATTR_CCA_MODE])
+                return -EINVAL;
+
+        cca.mode = nla_get_u32(info->attrs[NL802154_ATTR_CCA_MODE]);
+        /* checking 802.15.4 constraints */
+        if (cca.mode < NL802154_CCA_ENERGY || cca.mode > NL802154_CCA_ATTR_MAX)
+                return -EINVAL;
+
+        if (cca.mode == NL802154_CCA_ENERGY_CARRIER) {
+                if (!info->attrs[NL802154_ATTR_CCA_OPT])
+                        return -EINVAL;
+
+                cca.opt = nla_get_u32(info->attrs[NL802154_ATTR_CCA_OPT]);
+                if (cca.opt > NL802154_CCA_OPT_ATTR_MAX)
+                        return -EINVAL;
+        }
+
+        return rdev_set_cca_mode(rdev, &cca);
+}
+
 static int nl802154_set_pan_id(struct sk_buff *skb, struct genl_info *info)
 {
         struct cfg802154_registered_device *rdev = info->user_ptr[0];
@@ -895,6 +927,14 @@ static const struct genl_ops nl802154_ops[] = {
                                   NL802154_FLAG_NEED_RTNL,
         },
         {
+                .cmd = NL802154_CMD_SET_CCA_MODE,
+                .doit = nl802154_set_cca_mode,
+                .policy = nl802154_policy,
+                .flags = GENL_ADMIN_PERM,
+                .internal_flags = NL802154_FLAG_NEED_WPAN_PHY |
+                                  NL802154_FLAG_NEED_RTNL,
+        },
+        {
                 .cmd = NL802154_CMD_SET_PAN_ID,
                 .doit = nl802154_set_pan_id,
                 .policy = nl802154_policy,
diff --git a/net/ieee802154/rdev-ops.h b/net/ieee802154/rdev-ops.h
index aff54fbd9264..7c46732fad2b 100644
--- a/net/ieee802154/rdev-ops.h
+++ b/net/ieee802154/rdev-ops.h
@@ -42,6 +42,13 @@ rdev_set_channel(struct cfg802154_registered_device *rdev, u8 page, u8 channel)
 }
 
 static inline int
+rdev_set_cca_mode(struct cfg802154_registered_device *rdev,
+                  const struct wpan_phy_cca *cca)
+{
+        return rdev->ops->set_cca_mode(&rdev->wpan_phy, cca);
+}
+
+static inline int
 rdev_set_pan_id(struct cfg802154_registered_device *rdev,
                 struct wpan_dev *wpan_dev, __le16 pan_id)
 {