ieee802154: add set transmit power support
This patch adds transmission power setting support for IEEE-802.15.4 devices via nl802154. Signed-off-by: Varka Bhadram <varkab@cdac.in> Acked-by: Alexander Aring <alex.aring@gmail.com> Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
This commit is contained in:
parent
fc4f805243
commit
0f999b09f5
|
@ -44,6 +44,7 @@ struct cfg802154_ops {
|
|||
int (*set_channel)(struct wpan_phy *wpan_phy, u8 page, u8 channel);
|
||||
int (*set_cca_mode)(struct wpan_phy *wpan_phy,
|
||||
const struct wpan_phy_cca *cca);
|
||||
int (*set_tx_power)(struct wpan_phy *wpan_phy, s32 power);
|
||||
int (*set_pan_id)(struct wpan_phy *wpan_phy,
|
||||
struct wpan_dev *wpan_dev, __le16 pan_id);
|
||||
int (*set_short_addr)(struct wpan_phy *wpan_phy,
|
||||
|
|
|
@ -783,6 +783,28 @@ static int nl802154_set_cca_mode(struct sk_buff *skb, struct genl_info *info)
|
|||
return rdev_set_cca_mode(rdev, &cca);
|
||||
}
|
||||
|
||||
static int nl802154_set_tx_power(struct sk_buff *skb, struct genl_info *info)
|
||||
{
|
||||
struct cfg802154_registered_device *rdev = info->user_ptr[0];
|
||||
s32 power;
|
||||
int i;
|
||||
|
||||
if (!(rdev->wpan_phy.flags & WPAN_PHY_FLAG_TXPOWER))
|
||||
return -EOPNOTSUPP;
|
||||
|
||||
if (!info->attrs[NL802154_ATTR_TX_POWER])
|
||||
return -EINVAL;
|
||||
|
||||
power = nla_get_s32(info->attrs[NL802154_ATTR_TX_POWER]);
|
||||
|
||||
for (i = 0; i < rdev->wpan_phy.supported.tx_powers_size; i++) {
|
||||
if (power == rdev->wpan_phy.supported.tx_powers[i])
|
||||
return rdev_set_tx_power(rdev, power);
|
||||
}
|
||||
|
||||
return -EINVAL;
|
||||
}
|
||||
|
||||
static int nl802154_set_pan_id(struct sk_buff *skb, struct genl_info *info)
|
||||
{
|
||||
struct cfg802154_registered_device *rdev = info->user_ptr[0];
|
||||
|
@ -1093,6 +1115,14 @@ static const struct genl_ops nl802154_ops[] = {
|
|||
.internal_flags = NL802154_FLAG_NEED_WPAN_PHY |
|
||||
NL802154_FLAG_NEED_RTNL,
|
||||
},
|
||||
{
|
||||
.cmd = NL802154_CMD_SET_TX_POWER,
|
||||
.doit = nl802154_set_tx_power,
|
||||
.policy = nl802154_policy,
|
||||
.flags = GENL_ADMIN_PERM,
|
||||
.internal_flags = NL802154_FLAG_NEED_WPAN_PHY |
|
||||
NL802154_FLAG_NEED_RTNL,
|
||||
},
|
||||
{
|
||||
.cmd = NL802154_CMD_SET_PAN_ID,
|
||||
.doit = nl802154_set_pan_id,
|
||||
|
|
|
@ -74,6 +74,18 @@ rdev_set_cca_mode(struct cfg802154_registered_device *rdev,
|
|||
return ret;
|
||||
}
|
||||
|
||||
static inline int
|
||||
rdev_set_tx_power(struct cfg802154_registered_device *rdev,
|
||||
s32 power)
|
||||
{
|
||||
int ret;
|
||||
|
||||
trace_802154_rdev_set_tx_power(&rdev->wpan_phy, power);
|
||||
ret = rdev->ops->set_tx_power(&rdev->wpan_phy, power);
|
||||
trace_802154_rdev_return_int(&rdev->wpan_phy, ret);
|
||||
return ret;
|
||||
}
|
||||
|
||||
static inline int
|
||||
rdev_set_pan_id(struct cfg802154_registered_device *rdev,
|
||||
struct wpan_dev *wpan_dev, __le16 pan_id)
|
||||
|
|
|
@ -93,6 +93,21 @@ TRACE_EVENT(802154_rdev_set_channel,
|
|||
__entry->page, __entry->channel)
|
||||
);
|
||||
|
||||
TRACE_EVENT(802154_rdev_set_tx_power,
|
||||
TP_PROTO(struct wpan_phy *wpan_phy, s32 power),
|
||||
TP_ARGS(wpan_phy, power),
|
||||
TP_STRUCT__entry(
|
||||
WPAN_PHY_ENTRY
|
||||
__field(s32, power)
|
||||
),
|
||||
TP_fast_assign(
|
||||
WPAN_PHY_ASSIGN;
|
||||
__entry->power = power;
|
||||
),
|
||||
TP_printk(WPAN_PHY_PR_FMT ", power: %d", WPAN_PHY_PR_ARG,
|
||||
__entry->power)
|
||||
);
|
||||
|
||||
TRACE_EVENT(802154_rdev_set_cca_mode,
|
||||
TP_PROTO(struct wpan_phy *wpan_phy, const struct wpan_phy_cca *cca),
|
||||
TP_ARGS(wpan_phy, cca),
|
||||
|
|
|
@ -105,6 +105,24 @@ ieee802154_set_cca_mode(struct wpan_phy *wpan_phy,
|
|||
return ret;
|
||||
}
|
||||
|
||||
static int
|
||||
ieee802154_set_tx_power(struct wpan_phy *wpan_phy, s32 power)
|
||||
{
|
||||
struct ieee802154_local *local = wpan_phy_priv(wpan_phy);
|
||||
int ret;
|
||||
|
||||
ASSERT_RTNL();
|
||||
|
||||
if (wpan_phy->transmit_power == power)
|
||||
return 0;
|
||||
|
||||
ret = drv_set_tx_power(local, power);
|
||||
if (!ret)
|
||||
wpan_phy->transmit_power = power;
|
||||
|
||||
return ret;
|
||||
}
|
||||
|
||||
static int
|
||||
ieee802154_set_pan_id(struct wpan_phy *wpan_phy, struct wpan_dev *wpan_dev,
|
||||
__le16 pan_id)
|
||||
|
@ -195,6 +213,7 @@ const struct cfg802154_ops mac802154_config_ops = {
|
|||
.del_virtual_intf = ieee802154_del_iface,
|
||||
.set_channel = ieee802154_set_channel,
|
||||
.set_cca_mode = ieee802154_set_cca_mode,
|
||||
.set_tx_power = ieee802154_set_tx_power,
|
||||
.set_pan_id = ieee802154_set_pan_id,
|
||||
.set_short_addr = ieee802154_set_short_addr,
|
||||
.set_backoff_exponent = ieee802154_set_backoff_exponent,
|
||||
|
|
Loading…
Reference in New Issue