diff options
author | Alexander Aring <alex.aring@gmail.com> | 2014-11-11 21:37:03 -0500 |
---|---|---|
committer | Marcel Holtmann <marcel@holtmann.org> | 2014-11-11 23:10:42 -0500 |
commit | 17a3a46bfbf1c2b944812a81b11ffe255a55e9ca (patch) | |
tree | a229bdacee6bfebd328a00885e30450976481b7e /net/ieee802154 | |
parent | 17561bfe6fe2cde8699b6c98d9078dfa3e36911d (diff) |
ieee820154: add max frame retries setting support
This patch add support for setting mac frame retries setting via
nl802154 framework.
Signed-off-by: Alexander Aring <alex.aring@gmail.com>
Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
Diffstat (limited to 'net/ieee802154')
-rw-r--r-- | net/ieee802154/nl802154.c | 32 | ||||
-rw-r--r-- | net/ieee802154/rdev-ops.h | 9 |
2 files changed, 41 insertions, 0 deletions
diff --git a/net/ieee802154/nl802154.c b/net/ieee802154/nl802154.c index af383553bdd2..0e272c67c49b 100644 --- a/net/ieee802154/nl802154.c +++ b/net/ieee802154/nl802154.c | |||
@@ -667,6 +667,30 @@ nl802154_set_max_csma_backoffs(struct sk_buff *skb, struct genl_info *info) | |||
667 | return rdev_set_max_csma_backoffs(rdev, wpan_dev, max_csma_backoffs); | 667 | return rdev_set_max_csma_backoffs(rdev, wpan_dev, max_csma_backoffs); |
668 | } | 668 | } |
669 | 669 | ||
670 | static int | ||
671 | nl802154_set_max_frame_retries(struct sk_buff *skb, struct genl_info *info) | ||
672 | { | ||
673 | struct cfg802154_registered_device *rdev = info->user_ptr[0]; | ||
674 | struct net_device *dev = info->user_ptr[1]; | ||
675 | struct wpan_dev *wpan_dev = dev->ieee802154_ptr; | ||
676 | s8 max_frame_retries; | ||
677 | |||
678 | if (netif_running(dev)) | ||
679 | return -EBUSY; | ||
680 | |||
681 | if (!info->attrs[NL802154_ATTR_MAX_FRAME_RETRIES]) | ||
682 | return -EINVAL; | ||
683 | |||
684 | max_frame_retries = nla_get_s8( | ||
685 | info->attrs[NL802154_ATTR_MAX_FRAME_RETRIES]); | ||
686 | |||
687 | /* check 802.15.4 constraints */ | ||
688 | if (max_frame_retries < -1 || max_frame_retries > 7) | ||
689 | return -EINVAL; | ||
690 | |||
691 | return rdev_set_max_frame_retries(rdev, wpan_dev, max_frame_retries); | ||
692 | } | ||
693 | |||
670 | #define NL802154_FLAG_NEED_WPAN_PHY 0x01 | 694 | #define NL802154_FLAG_NEED_WPAN_PHY 0x01 |
671 | #define NL802154_FLAG_NEED_NETDEV 0x02 | 695 | #define NL802154_FLAG_NEED_NETDEV 0x02 |
672 | #define NL802154_FLAG_NEED_RTNL 0x04 | 696 | #define NL802154_FLAG_NEED_RTNL 0x04 |
@@ -817,6 +841,14 @@ static const struct genl_ops nl802154_ops[] = { | |||
817 | .internal_flags = NL802154_FLAG_NEED_NETDEV | | 841 | .internal_flags = NL802154_FLAG_NEED_NETDEV | |
818 | NL802154_FLAG_NEED_RTNL, | 842 | NL802154_FLAG_NEED_RTNL, |
819 | }, | 843 | }, |
844 | { | ||
845 | .cmd = NL802154_CMD_SET_MAX_FRAME_RETRIES, | ||
846 | .doit = nl802154_set_max_frame_retries, | ||
847 | .policy = nl802154_policy, | ||
848 | .flags = GENL_ADMIN_PERM, | ||
849 | .internal_flags = NL802154_FLAG_NEED_NETDEV | | ||
850 | NL802154_FLAG_NEED_RTNL, | ||
851 | }, | ||
820 | }; | 852 | }; |
821 | 853 | ||
822 | /* initialisation/exit functions */ | 854 | /* initialisation/exit functions */ |
diff --git a/net/ieee802154/rdev-ops.h b/net/ieee802154/rdev-ops.h index 263095c8686c..f9171aaf985e 100644 --- a/net/ieee802154/rdev-ops.h +++ b/net/ieee802154/rdev-ops.h | |||
@@ -59,4 +59,13 @@ rdev_set_max_csma_backoffs(struct cfg802154_registered_device *rdev, | |||
59 | max_csma_backoffs); | 59 | max_csma_backoffs); |
60 | } | 60 | } |
61 | 61 | ||
62 | static inline int | ||
63 | rdev_set_max_frame_retries(struct cfg802154_registered_device *rdev, | ||
64 | struct wpan_dev *wpan_dev, | ||
65 | const s8 max_frame_retries) | ||
66 | { | ||
67 | return rdev->ops->set_max_frame_retries(&rdev->wpan_phy, wpan_dev, | ||
68 | max_frame_retries); | ||
69 | } | ||
70 | |||
62 | #endif /* __CFG802154_RDEV_OPS */ | 71 | #endif /* __CFG802154_RDEV_OPS */ |