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

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

mac802154: remove mib lock 



This patch removes the mib lock. The new locking mechanism is to protect
the mib values with the rtnl lock. Note that this isn't always necessary
if we have an interface up the most mib values are readonly (e.g.
address settings). With this behaviour we can remove locking in
hotpath like frame parsing completely. It depends on context if we need
to hold the rtnl lock or not, this makes the callbacks of
ieee802154_mlme_ops unnecessary because these callbacks hols always the
locks.

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 344f8c11

include/net/ieee802154_netdev.h

+0 −9
Original line number Diff line number Diff line
@@ -422,15 +422,6 @@ struct ieee802154_mlme_ops { 
			       struct ieee802154_mac_params *params);



	struct ieee802154_llsec_ops *llsec;



	/* The fields below are required. */



	/*

	 * FIXME: these should become the part of PIB/MIB interface.

	 * However we still don't have IB interface of any kind

	 */

	__le16 (*get_pan_id)(const struct net_device *dev);

	__le16 (*get_short_addr)(const struct net_device *dev);

};



static inline struct ieee802154_mlme_ops *

net/ieee802154/6lowpan/core.c

+0 −20
Original line number Diff line number Diff line
@@ -55,20 +55,6 @@ 
LIST_HEAD(lowpan_devices);

static int lowpan_open_count;



static __le16 lowpan_get_pan_id(const struct net_device *dev)

{

	struct net_device *real_dev = lowpan_dev_info(dev)->real_dev;



	return ieee802154_mlme_ops(real_dev)->get_pan_id(real_dev);

}



static __le16 lowpan_get_short_addr(const struct net_device *dev)

{

	struct net_device *real_dev = lowpan_dev_info(dev)->real_dev;



	return ieee802154_mlme_ops(real_dev)->get_short_addr(real_dev);

}



static struct header_ops lowpan_header_ops = {

	.create	= lowpan_header_create,

};
@@ -96,11 +82,6 @@ static const struct net_device_ops lowpan_netdev_ops = { 
	.ndo_start_xmit		= lowpan_xmit,

};



static struct ieee802154_mlme_ops lowpan_mlme = {

	.get_pan_id = lowpan_get_pan_id,

	.get_short_addr = lowpan_get_short_addr,

};



static void lowpan_setup(struct net_device *dev)

{

	dev->addr_len		= IEEE802154_ADDR_LEN;
@@ -116,7 +97,6 @@ static void lowpan_setup(struct net_device *dev) 


	dev->netdev_ops		= &lowpan_netdev_ops;

	dev->header_ops		= &lowpan_header_ops;

	dev->ml_priv		= &lowpan_mlme;

	dev->destructor		= free_netdev;

	dev->features		|= NETIF_F_NETNS_LOCAL;

}

net/ieee802154/6lowpan/tx.c

+1 −1
Original line number Diff line number Diff line
@@ -207,7 +207,7 @@ static int lowpan_header(struct sk_buff *skb, struct net_device *dev) 


	/* prepare wpan address data */

	sa.mode = IEEE802154_ADDR_LONG;

	sa.pan_id = ieee802154_mlme_ops(dev)->get_pan_id(dev);

	sa.pan_id = lowpan_dev_info(dev)->real_dev->ieee802154_ptr->pan_id;

	sa.extended_addr = ieee802154_devaddr_from_raw(saddr);



	/* intra-PAN communications */

net/ieee802154/nl-mac.c

+10 −4
Original line number Diff line number Diff line
@@ -97,8 +97,10 @@ static int ieee802154_nl_fill_iface(struct sk_buff *msg, u32 portid, 
	BUG_ON(!phy);

	get_device(&phy->dev);



	short_addr = ops->get_short_addr(dev);

	pan_id = ops->get_pan_id(dev);

	rtnl_lock();

	short_addr = dev->ieee802154_ptr->short_addr;

	pan_id = dev->ieee802154_ptr->pan_id;

	rtnl_unlock();



	if (nla_put_string(msg, IEEE802154_ATTR_DEV_NAME, dev->name) ||

	    nla_put_string(msg, IEEE802154_ATTR_PHY_NAME, wpan_phy_name(phy)) ||
@@ -244,7 +246,9 @@ int ieee802154_associate_resp(struct sk_buff *skb, struct genl_info *info) 
	addr.mode = IEEE802154_ADDR_LONG;

	addr.extended_addr = nla_get_hwaddr(

			info->attrs[IEEE802154_ATTR_DEST_HW_ADDR]);

	addr.pan_id = ieee802154_mlme_ops(dev)->get_pan_id(dev);

	rtnl_lock();

	addr.pan_id = dev->ieee802154_ptr->pan_id;

	rtnl_unlock();



	ret = ieee802154_mlme_ops(dev)->assoc_resp(dev, &addr,

		nla_get_shortaddr(info->attrs[IEEE802154_ATTR_DEST_SHORT_ADDR]),
@@ -281,7 +285,9 @@ int ieee802154_disassociate_req(struct sk_buff *skb, struct genl_info *info) 
		addr.short_addr = nla_get_shortaddr(

				info->attrs[IEEE802154_ATTR_DEST_SHORT_ADDR]);

	}

	addr.pan_id = ieee802154_mlme_ops(dev)->get_pan_id(dev);

	rtnl_lock();

	addr.pan_id = dev->ieee802154_ptr->pan_id;

	rtnl_unlock();



	ret = ieee802154_mlme_ops(dev)->disassoc_req(dev, &addr,

			nla_get_u8(info->attrs[IEEE802154_ATTR_REASON]));

net/ieee802154/socket.c

+5 −7
Original line number Diff line number Diff line
@@ -64,10 +64,8 @@ ieee802154_get_dev(struct net *net, const struct ieee802154_addr *addr) 
			if (tmp->type != ARPHRD_IEEE802154)

				continue;



			pan_id = ieee802154_mlme_ops(tmp)->get_pan_id(tmp);

			short_addr =

				ieee802154_mlme_ops(tmp)->get_short_addr(tmp);



			pan_id = tmp->ieee802154_ptr->pan_id;

			short_addr = tmp->ieee802154_ptr->short_addr;

			if (pan_id == addr->pan_id &&

			    short_addr == addr->short_addr) {

				dev = tmp;
@@ -797,9 +795,9 @@ static int ieee802154_dgram_deliver(struct net_device *dev, struct sk_buff *skb) 
	/* Data frame processing */

	BUG_ON(dev->type != ARPHRD_IEEE802154);



	pan_id = ieee802154_mlme_ops(dev)->get_pan_id(dev);

	short_addr = ieee802154_mlme_ops(dev)->get_short_addr(dev);

	hw_addr = ieee802154_devaddr_from_raw(dev->dev_addr);

	pan_id = dev->ieee802154_ptr->pan_id;

	short_addr = dev->ieee802154_ptr->short_addr;

	hw_addr = dev->ieee802154_ptr->extended_addr;



	read_lock(&dgram_lock);

	sk_for_each(sk, &dgram_head) {