aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexander Aring <alex.aring@gmail.com>2014-11-11 21:37:05 -0500
committerMarcel Holtmann <marcel@holtmann.org>2014-11-11 23:10:43 -0500
commitc8937a1d112b1a948454f4fa2f9b747fee2a3f66 (patch)
tree0030b741ec3ff4fcf40f7936a836abc0ee970b45
parentf426fd03da1ec3954cefb7867daca4b2ba9de36c (diff)
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>
-rw-r--r--include/net/cfg802154.h2
-rw-r--r--net/ieee802154/nl802154.c25
-rw-r--r--net/ieee802154/rdev-ops.h7
-rw-r--r--net/mac802154/cfg.c16
4 files changed, 50 insertions, 0 deletions
diff --git a/include/net/cfg802154.h b/include/net/cfg802154.h
index 5c3bc12706c2..fa0a9e519523 100644
--- a/include/net/cfg802154.h
+++ b/include/net/cfg802154.h
@@ -51,6 +51,8 @@ struct cfg802154_ops {
51 int (*set_max_frame_retries)(struct wpan_phy *wpan_phy, 51 int (*set_max_frame_retries)(struct wpan_phy *wpan_phy,
52 struct wpan_dev *wpan_dev, 52 struct wpan_dev *wpan_dev,
53 s8 max_frame_retries); 53 s8 max_frame_retries);
54 int (*set_lbt_mode)(struct wpan_phy *wpan_phy,
55 struct wpan_dev *wpan_dev, bool mode);
54}; 56};
55 57
56struct wpan_phy { 58struct wpan_phy {
diff --git a/net/ieee802154/nl802154.c b/net/ieee802154/nl802154.c
index 0e272c67c49b..ccdf33ecee0b 100644
--- 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)
691 return rdev_set_max_frame_retries(rdev, wpan_dev, max_frame_retries); 691 return rdev_set_max_frame_retries(rdev, wpan_dev, max_frame_retries);
692} 692}
693 693
694static int nl802154_set_lbt_mode(struct sk_buff *skb, struct genl_info *info)
695{
696 struct cfg802154_registered_device *rdev = info->user_ptr[0];
697 struct net_device *dev = info->user_ptr[1];
698 struct wpan_dev *wpan_dev = dev->ieee802154_ptr;
699 bool mode;
700
701 if (netif_running(dev))
702 return -EBUSY;
703
704 if (!info->attrs[NL802154_ATTR_LBT_MODE])
705 return -EINVAL;
706
707 mode = !!nla_get_u8(info->attrs[NL802154_ATTR_LBT_MODE]);
708 return rdev_set_lbt_mode(rdev, wpan_dev, mode);
709}
710
694#define NL802154_FLAG_NEED_WPAN_PHY 0x01 711#define NL802154_FLAG_NEED_WPAN_PHY 0x01
695#define NL802154_FLAG_NEED_NETDEV 0x02 712#define NL802154_FLAG_NEED_NETDEV 0x02
696#define NL802154_FLAG_NEED_RTNL 0x04 713#define NL802154_FLAG_NEED_RTNL 0x04
@@ -849,6 +866,14 @@ static const struct genl_ops nl802154_ops[] = {
849 .internal_flags = NL802154_FLAG_NEED_NETDEV | 866 .internal_flags = NL802154_FLAG_NEED_NETDEV |
850 NL802154_FLAG_NEED_RTNL, 867 NL802154_FLAG_NEED_RTNL,
851 }, 868 },
869 {
870 .cmd = NL802154_CMD_SET_LBT_MODE,
871 .doit = nl802154_set_lbt_mode,
872 .policy = nl802154_policy,
873 .flags = GENL_ADMIN_PERM,
874 .internal_flags = NL802154_FLAG_NEED_NETDEV |
875 NL802154_FLAG_NEED_RTNL,
876 },
852}; 877};
853 878
854/* initialisation/exit functions */ 879/* initialisation/exit functions */
diff --git a/net/ieee802154/rdev-ops.h b/net/ieee802154/rdev-ops.h
index f9171aaf985e..a78f700bc821 100644
--- 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,
68 max_frame_retries); 68 max_frame_retries);
69} 69}
70 70
71static inline int
72rdev_set_lbt_mode(struct cfg802154_registered_device *rdev,
73 struct wpan_dev *wpan_dev, const bool mode)
74{
75 return rdev->ops->set_lbt_mode(&rdev->wpan_phy, wpan_dev, mode);
76}
77
71#endif /* __CFG802154_RDEV_OPS */ 78#endif /* __CFG802154_RDEV_OPS */
diff --git a/net/mac802154/cfg.c b/net/mac802154/cfg.c
index a8f6eaa76d4d..5d669d87dd7d 100644
--- 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,
155 return 0; 155 return 0;
156} 156}
157 157
158static int ieee802154_set_lbt_mode(struct wpan_phy *wpan_phy,
159 struct wpan_dev *wpan_dev,
160 const bool mode)
161{
162 struct ieee802154_local *local = wpan_phy_priv(wpan_phy);
163
164 ASSERT_RTNL();
165
166 if (!(local->hw.flags & IEEE802154_HW_LBT))
167 return -EOPNOTSUPP;
168
169 wpan_dev->lbt = mode;
170 return 0;
171}
172
158const struct cfg802154_ops mac802154_config_ops = { 173const struct cfg802154_ops mac802154_config_ops = {
159 .add_virtual_intf_deprecated = ieee802154_add_iface_deprecated, 174 .add_virtual_intf_deprecated = ieee802154_add_iface_deprecated,
160 .del_virtual_intf_deprecated = ieee802154_del_iface_deprecated, 175 .del_virtual_intf_deprecated = ieee802154_del_iface_deprecated,
@@ -164,4 +179,5 @@ const struct cfg802154_ops mac802154_config_ops = {
164 .set_backoff_exponent = ieee802154_set_backoff_exponent, 179 .set_backoff_exponent = ieee802154_set_backoff_exponent,
165 .set_max_csma_backoffs = ieee802154_set_max_csma_backoffs, 180 .set_max_csma_backoffs = ieee802154_set_max_csma_backoffs,
166 .set_max_frame_retries = ieee802154_set_max_frame_retries, 181 .set_max_frame_retries = ieee802154_set_max_frame_retries,
182 .set_lbt_mode = ieee802154_set_lbt_mode,
167}; 183};