diff options
| author | Alexander Aring | 2015-05-17 21:44:41 +0200 |
|---|---|---|
| committer | Marcel Holtmann | 2015-05-19 11:44:42 +0200 |
| commit | 32b23550ad64d9676f2218b3d5de46bacf98ef1d (patch) | |
| tree | b6c2c1523a886fd89cb12a04c46e02787641f26b /net/ieee802154/nl-mac.c | |
| parent | ieee802154: change transmit power to mbm (diff) | |
| download | kernel-qcow2-linux-32b23550ad64d9676f2218b3d5de46bacf98ef1d.tar.gz kernel-qcow2-linux-32b23550ad64d9676f2218b3d5de46bacf98ef1d.tar.xz kernel-qcow2-linux-32b23550ad64d9676f2218b3d5de46bacf98ef1d.zip | |
ieee802154: change cca ed level to mbm
This patch change the handling of cca energy detection level from dbm to
mbm. This prepares to handle floating point cca energy detection levels
values. The old netlink 802.15.4 will convert the dbm value to mbm for
handling backward compatibility.
Signed-off-by: Alexander Aring <alex.aring@gmail.com>
Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
Diffstat (limited to 'net/ieee802154/nl-mac.c')
| -rw-r--r-- | net/ieee802154/nl-mac.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/ieee802154/nl-mac.c b/net/ieee802154/nl-mac.c index 4ba2e13f7a07..cdc1cc3543f6 100644 --- a/net/ieee802154/nl-mac.c +++ b/net/ieee802154/nl-mac.c @@ -122,7 +122,7 @@ static int ieee802154_nl_fill_iface(struct sk_buff *msg, u32 portid, nla_put_u8(msg, IEEE802154_ATTR_CCA_MODE, params.cca.mode) || nla_put_s32(msg, IEEE802154_ATTR_CCA_ED_LEVEL, - params.cca_ed_level) || + params.cca_ed_level / 100) || nla_put_u8(msg, IEEE802154_ATTR_CSMA_RETRIES, params.csma_retries) || nla_put_u8(msg, IEEE802154_ATTR_CSMA_MIN_BE, @@ -519,7 +519,7 @@ int ieee802154_set_macparams(struct sk_buff *skb, struct genl_info *info) params.cca.mode = nla_get_u8(info->attrs[IEEE802154_ATTR_CCA_MODE]); if (info->attrs[IEEE802154_ATTR_CCA_ED_LEVEL]) - params.cca_ed_level = nla_get_s32(info->attrs[IEEE802154_ATTR_CCA_ED_LEVEL]); + params.cca_ed_level = nla_get_s32(info->attrs[IEEE802154_ATTR_CCA_ED_LEVEL]) * 100; if (info->attrs[IEEE802154_ATTR_CSMA_RETRIES]) params.csma_retries = nla_get_u8(info->attrs[IEEE802154_ATTR_CSMA_RETRIES]); |