Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4a3a8c0c authored by Alexander Aring's avatar Alexander Aring Committed by Marcel Holtmann
Browse files

mac802154: remove pib lock 



This patch removes the pib lock which is now replaced by rtnl lock. The
new interface already use the rtnl lock only. Nevertheless this patch
will fix issues while using new and old interface at the same time.

Signed-off-by: default avatarAlexander Aring <alex.aring@gmail.com>
Reviewed-by: default avatarStefan Schmidt <stefan@osg.samsung.com>
Signed-off-by: default avatarMarcel Holtmann <marcel@holtmann.org>
parent 4a669f7d

include/net/cfg802154.h

+0 −2
Original line number Diff line number Diff line
@@ -121,8 +121,6 @@ enum wpan_phy_flags { 
};



struct wpan_phy {

	struct mutex pib_lock;



	/* If multiple wpan_phys are registered and you're handed e.g.

	 * a regular netdev with assigned ieee802154_ptr, you won't

	 * know whether it points to a wpan_phy your driver has registered

net/ieee802154/core.c

+0 −2
Original line number Diff line number Diff line
@@ -121,8 +121,6 @@ wpan_phy_new(const struct cfg802154_ops *ops, size_t priv_size) 
	/* atomic_inc_return makes it start at 1, make it start at 0 */

	rdev->wpan_phy_idx--;



	mutex_init(&rdev->wpan_phy.pib_lock);



	INIT_LIST_HEAD(&rdev->wpan_dev_list);

	device_initialize(&rdev->wpan_phy.dev);

	dev_set_name(&rdev->wpan_phy.dev, PHY_NAME "%d", rdev->wpan_phy_idx);

net/ieee802154/nl-phy.c

+3 −3
Original line number Diff line number Diff line
@@ -50,7 +50,7 @@ static int ieee802154_nl_fill_phy(struct sk_buff *msg, u32 portid, 
	if (!hdr)

		goto out;



	mutex_lock(&phy->pib_lock);

	rtnl_lock();

	if (nla_put_string(msg, IEEE802154_ATTR_PHY_NAME, wpan_phy_name(phy)) ||

	    nla_put_u8(msg, IEEE802154_ATTR_PAGE, phy->current_page) ||

	    nla_put_u8(msg, IEEE802154_ATTR_CHANNEL, phy->current_channel))
@@ -63,13 +63,13 @@ static int ieee802154_nl_fill_phy(struct sk_buff *msg, u32 portid, 
	    nla_put(msg, IEEE802154_ATTR_CHANNEL_PAGE_LIST,

		    pages * sizeof(uint32_t), buf))

		goto nla_put_failure;

	mutex_unlock(&phy->pib_lock);

	rtnl_unlock();

	kfree(buf);

	genlmsg_end(msg, hdr);

	return 0;



nla_put_failure:

	mutex_unlock(&phy->pib_lock);

	rtnl_unlock();

	genlmsg_cancel(msg, hdr);

out:

	kfree(buf);

net/mac802154/iface.c

+0 −7
Original line number Diff line number Diff line
@@ -242,7 +242,6 @@ static int mac802154_wpan_open(struct net_device *dev) 
	struct ieee802154_sub_if_data *sdata = IEEE802154_DEV_TO_SUB_IF(dev);

	struct ieee802154_local *local = sdata->local;

	struct wpan_dev *wpan_dev = &sdata->wpan_dev;

	struct wpan_phy *phy = sdata->local->phy;



	rc = ieee802154_check_concurrent_iface(sdata, sdata->vif.type);

	if (rc < 0)
@@ -252,8 +251,6 @@ static int mac802154_wpan_open(struct net_device *dev) 
	if (rc < 0)

		return rc;



	mutex_lock(&phy->pib_lock);



	if (local->hw.flags & IEEE802154_HW_PROMISCUOUS) {

		rc = drv_set_promiscuous_mode(local,

					      wpan_dev->promiscuous_mode);
@@ -295,11 +292,7 @@ static int mac802154_wpan_open(struct net_device *dev) 
			goto out;

	}



	mutex_unlock(&phy->pib_lock);

	return 0;



out:

	mutex_unlock(&phy->pib_lock);

	return rc;

}

net/mac802154/mib.c

+2 −2
Original line number Diff line number Diff line
@@ -91,16 +91,16 @@ void mac802154_dev_set_page_channel(struct net_device *dev, u8 page, u8 chan) 
	struct ieee802154_local *local = sdata->local;

	int res;



	ASSERT_RTNL();



	BUG_ON(dev->type != ARPHRD_IEEE802154);



	res = drv_set_channel(local, page, chan);

	if (res) {

		pr_debug("set_channel failed\n");

	} else {

		mutex_lock(&local->phy->pib_lock);

		local->phy->current_channel = chan;

		local->phy->current_page = page;

		mutex_unlock(&local->phy->pib_lock);

	}

}