diff options
author | Alexander Aring <alex.aring@gmail.com> | 2014-11-09 02:36:57 -0500 |
---|---|---|
committer | Marcel Holtmann <marcel@holtmann.org> | 2014-11-09 13:50:29 -0500 |
commit | 7bea1ea7b4c16af7c9263648e10f7edc88e5fc21 (patch) | |
tree | 8092b084c39e45226260d031c9e4d477abbeed0a /net/mac802154 | |
parent | b03c9cccfa808f1b314097b162a36c3937cb818e (diff) |
ieee802154: netlink add rtnl lock
This patch adds rtnl lock hold mechanism while accessing wpan_dev
attributes. Furthermore these attributes should be protected by rtnl
lock and netif_running only.
Signed-off-by: Alexander Aring <alex.aring@gmail.com>
Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
Diffstat (limited to 'net/mac802154')
-rw-r--r-- | net/mac802154/mac_cmd.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/net/mac802154/mac_cmd.c b/net/mac802154/mac_cmd.c index b8bd95263aab..6aacb1816889 100644 --- a/net/mac802154/mac_cmd.c +++ b/net/mac802154/mac_cmd.c | |||
@@ -39,6 +39,8 @@ static int mac802154_mlme_start_req(struct net_device *dev, | |||
39 | struct ieee802154_mlme_ops *ops = ieee802154_mlme_ops(dev); | 39 | struct ieee802154_mlme_ops *ops = ieee802154_mlme_ops(dev); |
40 | int rc = 0; | 40 | int rc = 0; |
41 | 41 | ||
42 | ASSERT_RTNL(); | ||
43 | |||
42 | BUG_ON(addr->mode != IEEE802154_ADDR_SHORT); | 44 | BUG_ON(addr->mode != IEEE802154_ADDR_SHORT); |
43 | 45 | ||
44 | mac802154_dev_set_pan_id(dev, addr->pan_id); | 46 | mac802154_dev_set_pan_id(dev, addr->pan_id); |
@@ -75,7 +77,8 @@ static int mac802154_set_mac_params(struct net_device *dev, | |||
75 | struct wpan_dev *wpan_dev = &sdata->wpan_dev; | 77 | struct wpan_dev *wpan_dev = &sdata->wpan_dev; |
76 | int ret; | 78 | int ret; |
77 | 79 | ||
78 | mutex_lock(&sdata->local->iflist_mtx); | 80 | ASSERT_RTNL(); |
81 | |||
79 | /* PHY */ | 82 | /* PHY */ |
80 | wpan_dev->wpan_phy->transmit_power = params->transmit_power; | 83 | wpan_dev->wpan_phy->transmit_power = params->transmit_power; |
81 | wpan_dev->wpan_phy->cca_mode = params->cca_mode; | 84 | wpan_dev->wpan_phy->cca_mode = params->cca_mode; |
@@ -87,7 +90,6 @@ static int mac802154_set_mac_params(struct net_device *dev, | |||
87 | wpan_dev->csma_retries = params->csma_retries; | 90 | wpan_dev->csma_retries = params->csma_retries; |
88 | wpan_dev->frame_retries = params->frame_retries; | 91 | wpan_dev->frame_retries = params->frame_retries; |
89 | wpan_dev->lbt = params->lbt; | 92 | wpan_dev->lbt = params->lbt; |
90 | mutex_unlock(&sdata->local->iflist_mtx); | ||
91 | 93 | ||
92 | if (local->hw.flags & IEEE802154_HW_TXPOWER) { | 94 | if (local->hw.flags & IEEE802154_HW_TXPOWER) { |
93 | ret = drv_set_tx_power(local, params->transmit_power); | 95 | ret = drv_set_tx_power(local, params->transmit_power); |
@@ -116,7 +118,8 @@ static void mac802154_get_mac_params(struct net_device *dev, | |||
116 | struct ieee802154_sub_if_data *sdata = IEEE802154_DEV_TO_SUB_IF(dev); | 118 | struct ieee802154_sub_if_data *sdata = IEEE802154_DEV_TO_SUB_IF(dev); |
117 | struct wpan_dev *wpan_dev = &sdata->wpan_dev; | 119 | struct wpan_dev *wpan_dev = &sdata->wpan_dev; |
118 | 120 | ||
119 | mutex_lock(&sdata->local->iflist_mtx); | 121 | ASSERT_RTNL(); |
122 | |||
120 | /* PHY */ | 123 | /* PHY */ |
121 | params->transmit_power = wpan_dev->wpan_phy->transmit_power; | 124 | params->transmit_power = wpan_dev->wpan_phy->transmit_power; |
122 | params->cca_mode = wpan_dev->wpan_phy->cca_mode; | 125 | params->cca_mode = wpan_dev->wpan_phy->cca_mode; |
@@ -128,7 +131,6 @@ static void mac802154_get_mac_params(struct net_device *dev, | |||
128 | params->csma_retries = wpan_dev->csma_retries; | 131 | params->csma_retries = wpan_dev->csma_retries; |
129 | params->frame_retries = wpan_dev->frame_retries; | 132 | params->frame_retries = wpan_dev->frame_retries; |
130 | params->lbt = wpan_dev->lbt; | 133 | params->lbt = wpan_dev->lbt; |
131 | mutex_unlock(&sdata->local->iflist_mtx); | ||
132 | } | 134 | } |
133 | 135 | ||
134 | static struct ieee802154_llsec_ops mac802154_llsec_ops = { | 136 | static struct ieee802154_llsec_ops mac802154_llsec_ops = { |