ieee820154: add lbt setting support

This patch adds support for setting listen before transmit mode via
nl802154 framework.

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 5c3bc12706c2ab7c5594cbfee46b59608ee46d22..fa0a9e5195232a00c964fb971d35fd983e7b891b 100644 (file)
--- a/include/net/cfg802154.h
+++ b/include/net/cfg802154.h
@@ -51,6 +51,8 @@ struct cfg802154_ops {
        int     (*set_max_frame_retries)(struct wpan_phy *wpan_phy,
                                         struct wpan_dev *wpan_dev,
                                         s8 max_frame_retries);
+       int     (*set_lbt_mode)(struct wpan_phy *wpan_phy,
+                               struct wpan_dev *wpan_dev, bool mode);
 };
 
 struct wpan_phy {

diff --git a/net/ieee802154/nl802154.c b/net/ieee802154/nl802154.c
index 0e272c67c49bd6df564a25adf367e3ef50bcc1d7..ccdf33ecee0b0a5e33b36c7abfc3a31d85d65768 100644 (file)
--- a/net/ieee802154/nl802154.c
+++ b/net/ieee802154/nl802154.c
@@ -691,6 +691,23 @@ nl802154_set_max_frame_retries(struct sk_buff *skb, struct genl_info *info)
        return rdev_set_max_frame_retries(rdev, wpan_dev, max_frame_retries);
 }
 
+static int nl802154_set_lbt_mode(struct sk_buff *skb, struct genl_info *info)
+{
+       struct cfg802154_registered_device *rdev = info->user_ptr[0];
+       struct net_device *dev = info->user_ptr[1];
+       struct wpan_dev *wpan_dev = dev->ieee802154_ptr;
+       bool mode;
+
+       if (netif_running(dev))
+               return -EBUSY;
+
+       if (!info->attrs[NL802154_ATTR_LBT_MODE])
+               return -EINVAL;
+
+       mode = !!nla_get_u8(info->attrs[NL802154_ATTR_LBT_MODE]);
+       return rdev_set_lbt_mode(rdev, wpan_dev, mode);
+}
+
 #define NL802154_FLAG_NEED_WPAN_PHY    0x01
 #define NL802154_FLAG_NEED_NETDEV      0x02
 #define NL802154_FLAG_NEED_RTNL                0x04
@@ -849,6 +866,14 @@ static const struct genl_ops nl802154_ops[] = {
                .internal_flags = NL802154_FLAG_NEED_NETDEV |
                                  NL802154_FLAG_NEED_RTNL,
        },
+       {
+               .cmd = NL802154_CMD_SET_LBT_MODE,
+               .doit = nl802154_set_lbt_mode,
+               .policy = nl802154_policy,
+               .flags = GENL_ADMIN_PERM,
+               .internal_flags = NL802154_FLAG_NEED_NETDEV |
+                                 NL802154_FLAG_NEED_RTNL,
+       },
 };
 
 /* initialisation/exit functions */

diff --git a/net/ieee802154/rdev-ops.h b/net/ieee802154/rdev-ops.h
index f9171aaf985e22d59933e31b2782fb044381a9e4..a78f700bc82139f1825b61dc0af03e46ab6fdc19 100644 (file)
--- a/net/ieee802154/rdev-ops.h
+++ b/net/ieee802154/rdev-ops.h
@@ -68,4 +68,11 @@ rdev_set_max_frame_retries(struct cfg802154_registered_device *rdev,
                                                max_frame_retries);
 }
 
+static inline int
+rdev_set_lbt_mode(struct cfg802154_registered_device *rdev,
+                 struct wpan_dev *wpan_dev, const bool mode)
+{
+       return rdev->ops->set_lbt_mode(&rdev->wpan_phy, wpan_dev, mode);
+}
+
 #endif /* __CFG802154_RDEV_OPS */

diff --git a/net/mac802154/cfg.c b/net/mac802154/cfg.c
index a8f6eaa76d4d9ad30c7201630e153d10acd3bb71..5d669d87dd7d510a5bc5c573a319ba5da4a2ac31 100644 (file)
--- a/net/mac802154/cfg.c
+++ b/net/mac802154/cfg.c
@@ -155,6 +155,21 @@ static int ieee802154_set_max_frame_retries(struct wpan_phy *wpan_phy,
        return 0;
 }
 
+static int ieee802154_set_lbt_mode(struct wpan_phy *wpan_phy,
+                                  struct wpan_dev *wpan_dev,
+                                  const bool mode)
+{
+       struct ieee802154_local *local = wpan_phy_priv(wpan_phy);
+
+       ASSERT_RTNL();
+
+       if (!(local->hw.flags & IEEE802154_HW_LBT))
+               return -EOPNOTSUPP;
+
+       wpan_dev->lbt = mode;
+       return 0;
+}
+
 const struct cfg802154_ops mac802154_config_ops = {
        .add_virtual_intf_deprecated = ieee802154_add_iface_deprecated,
        .del_virtual_intf_deprecated = ieee802154_del_iface_deprecated,
@@ -164,4 +179,5 @@ const struct cfg802154_ops mac802154_config_ops = {
        .set_backoff_exponent = ieee802154_set_backoff_exponent,
        .set_max_csma_backoffs = ieee802154_set_max_csma_backoffs,
        .set_max_frame_retries = ieee802154_set_max_frame_retries,
+       .set_lbt_mode = ieee802154_set_lbt_mode,
 };