aboutsummaryrefslogtreecommitdiffstats
path: root/net/ieee802154
diff options
context:
space:
mode:
Diffstat (limited to 'net/ieee802154')
-rw-r--r--net/ieee802154/nl-mac.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/net/ieee802154/nl-mac.c b/net/ieee802154/nl-mac.c
index 7127b9d1a684..50e9863823a5 100644
--- a/net/ieee802154/nl-mac.c
+++ b/net/ieee802154/nl-mac.c
@@ -113,7 +113,9 @@ static int ieee802154_nl_fill_iface(struct sk_buff *msg, u32 portid,
113 if (ops->get_mac_params) { 113 if (ops->get_mac_params) {
114 struct ieee802154_mac_params params; 114 struct ieee802154_mac_params params;
115 115
116 rtnl_lock();
116 ops->get_mac_params(dev, &params); 117 ops->get_mac_params(dev, &params);
118 rtnl_unlock();
117 119
118 if (nla_put_s8(msg, IEEE802154_ATTR_TXPOWER, 120 if (nla_put_s8(msg, IEEE802154_ATTR_TXPOWER,
119 params.transmit_power) || 121 params.transmit_power) ||
@@ -348,8 +350,10 @@ int ieee802154_start_req(struct sk_buff *skb, struct genl_info *info)
348 return -EINVAL; 350 return -EINVAL;
349 } 351 }
350 352
353 rtnl_lock();
351 ret = ieee802154_mlme_ops(dev)->start_req(dev, &addr, channel, page, 354 ret = ieee802154_mlme_ops(dev)->start_req(dev, &addr, channel, page,
352 bcn_ord, sf_ord, pan_coord, blx, coord_realign); 355 bcn_ord, sf_ord, pan_coord, blx, coord_realign);
356 rtnl_unlock();
353 357
354 /* FIXME: add validation for unused parameters to be sane 358 /* FIXME: add validation for unused parameters to be sane
355 * for SoftMAC 359 * for SoftMAC
@@ -497,6 +501,7 @@ int ieee802154_set_macparams(struct sk_buff *skb, struct genl_info *info)
497 phy = dev->ieee802154_ptr->wpan_phy; 501 phy = dev->ieee802154_ptr->wpan_phy;
498 get_device(&phy->dev); 502 get_device(&phy->dev);
499 503
504 rtnl_lock();
500 ops->get_mac_params(dev, &params); 505 ops->get_mac_params(dev, &params);
501 506
502 if (info->attrs[IEEE802154_ATTR_TXPOWER]) 507 if (info->attrs[IEEE802154_ATTR_TXPOWER])
@@ -524,6 +529,7 @@ int ieee802154_set_macparams(struct sk_buff *skb, struct genl_info *info)
524 params.frame_retries = nla_get_s8(info->attrs[IEEE802154_ATTR_FRAME_RETRIES]); 529 params.frame_retries = nla_get_s8(info->attrs[IEEE802154_ATTR_FRAME_RETRIES]);
525 530
526 rc = ops->set_mac_params(dev, &params); 531 rc = ops->set_mac_params(dev, &params);
532 rtnl_unlock();
527 533
528 wpan_phy_put(phy); 534 wpan_phy_put(phy);
529 dev_put(dev); 535 dev_put(dev);