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>
This commit is contained in:
parent
17561bfe6f
commit
17a3a46bfb
|
@ -48,6 +48,9 @@ struct cfg802154_ops {
|
||||||
int (*set_max_csma_backoffs)(struct wpan_phy *wpan_phy,
|
int (*set_max_csma_backoffs)(struct wpan_phy *wpan_phy,
|
||||||
struct wpan_dev *wpan_dev,
|
struct wpan_dev *wpan_dev,
|
||||||
u8 max_csma_backoffs);
|
u8 max_csma_backoffs);
|
||||||
|
int (*set_max_frame_retries)(struct wpan_phy *wpan_phy,
|
||||||
|
struct wpan_dev *wpan_dev,
|
||||||
|
s8 max_frame_retries);
|
||||||
};
|
};
|
||||||
|
|
||||||
struct wpan_phy {
|
struct wpan_phy {
|
||||||
|
|
|
@ -667,6 +667,30 @@ nl802154_set_max_csma_backoffs(struct sk_buff *skb, struct genl_info *info)
|
||||||
return rdev_set_max_csma_backoffs(rdev, wpan_dev, max_csma_backoffs);
|
return rdev_set_max_csma_backoffs(rdev, wpan_dev, max_csma_backoffs);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static int
|
||||||
|
nl802154_set_max_frame_retries(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;
|
||||||
|
s8 max_frame_retries;
|
||||||
|
|
||||||
|
if (netif_running(dev))
|
||||||
|
return -EBUSY;
|
||||||
|
|
||||||
|
if (!info->attrs[NL802154_ATTR_MAX_FRAME_RETRIES])
|
||||||
|
return -EINVAL;
|
||||||
|
|
||||||
|
max_frame_retries = nla_get_s8(
|
||||||
|
info->attrs[NL802154_ATTR_MAX_FRAME_RETRIES]);
|
||||||
|
|
||||||
|
/* check 802.15.4 constraints */
|
||||||
|
if (max_frame_retries < -1 || max_frame_retries > 7)
|
||||||
|
return -EINVAL;
|
||||||
|
|
||||||
|
return rdev_set_max_frame_retries(rdev, wpan_dev, max_frame_retries);
|
||||||
|
}
|
||||||
|
|
||||||
#define NL802154_FLAG_NEED_WPAN_PHY 0x01
|
#define NL802154_FLAG_NEED_WPAN_PHY 0x01
|
||||||
#define NL802154_FLAG_NEED_NETDEV 0x02
|
#define NL802154_FLAG_NEED_NETDEV 0x02
|
||||||
#define NL802154_FLAG_NEED_RTNL 0x04
|
#define NL802154_FLAG_NEED_RTNL 0x04
|
||||||
|
@ -817,6 +841,14 @@ static const struct genl_ops nl802154_ops[] = {
|
||||||
.internal_flags = NL802154_FLAG_NEED_NETDEV |
|
.internal_flags = NL802154_FLAG_NEED_NETDEV |
|
||||||
NL802154_FLAG_NEED_RTNL,
|
NL802154_FLAG_NEED_RTNL,
|
||||||
},
|
},
|
||||||
|
{
|
||||||
|
.cmd = NL802154_CMD_SET_MAX_FRAME_RETRIES,
|
||||||
|
.doit = nl802154_set_max_frame_retries,
|
||||||
|
.policy = nl802154_policy,
|
||||||
|
.flags = GENL_ADMIN_PERM,
|
||||||
|
.internal_flags = NL802154_FLAG_NEED_NETDEV |
|
||||||
|
NL802154_FLAG_NEED_RTNL,
|
||||||
|
},
|
||||||
};
|
};
|
||||||
|
|
||||||
/* initialisation/exit functions */
|
/* initialisation/exit functions */
|
||||||
|
|
|
@ -59,4 +59,13 @@ rdev_set_max_csma_backoffs(struct cfg802154_registered_device *rdev,
|
||||||
max_csma_backoffs);
|
max_csma_backoffs);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static inline int
|
||||||
|
rdev_set_max_frame_retries(struct cfg802154_registered_device *rdev,
|
||||||
|
struct wpan_dev *wpan_dev,
|
||||||
|
const s8 max_frame_retries)
|
||||||
|
{
|
||||||
|
return rdev->ops->set_max_frame_retries(&rdev->wpan_phy, wpan_dev,
|
||||||
|
max_frame_retries);
|
||||||
|
}
|
||||||
|
|
||||||
#endif /* __CFG802154_RDEV_OPS */
|
#endif /* __CFG802154_RDEV_OPS */
|
||||||
|
|
|
@ -140,6 +140,21 @@ static int ieee802154_set_max_csma_backoffs(struct wpan_phy *wpan_phy,
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static int ieee802154_set_max_frame_retries(struct wpan_phy *wpan_phy,
|
||||||
|
struct wpan_dev *wpan_dev,
|
||||||
|
const s8 max_frame_retries)
|
||||||
|
{
|
||||||
|
struct ieee802154_local *local = wpan_phy_priv(wpan_phy);
|
||||||
|
|
||||||
|
ASSERT_RTNL();
|
||||||
|
|
||||||
|
if (!(local->hw.flags & IEEE802154_HW_FRAME_RETRIES))
|
||||||
|
return -EOPNOTSUPP;
|
||||||
|
|
||||||
|
wpan_dev->frame_retries = max_frame_retries;
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
const struct cfg802154_ops mac802154_config_ops = {
|
const struct cfg802154_ops mac802154_config_ops = {
|
||||||
.add_virtual_intf_deprecated = ieee802154_add_iface_deprecated,
|
.add_virtual_intf_deprecated = ieee802154_add_iface_deprecated,
|
||||||
.del_virtual_intf_deprecated = ieee802154_del_iface_deprecated,
|
.del_virtual_intf_deprecated = ieee802154_del_iface_deprecated,
|
||||||
|
@ -148,4 +163,5 @@ const struct cfg802154_ops mac802154_config_ops = {
|
||||||
.set_short_addr = ieee802154_set_short_addr,
|
.set_short_addr = ieee802154_set_short_addr,
|
||||||
.set_backoff_exponent = ieee802154_set_backoff_exponent,
|
.set_backoff_exponent = ieee802154_set_backoff_exponent,
|
||||||
.set_max_csma_backoffs = ieee802154_set_max_csma_backoffs,
|
.set_max_csma_backoffs = ieee802154_set_max_csma_backoffs,
|
||||||
|
.set_max_frame_retries = ieee802154_set_max_frame_retries,
|
||||||
};
|
};
|
||||||
|
|
Loading…
Reference in New Issue