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

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

mac802154: use atomic ops for sequence incrementation 



This patch will use atomic operations for sequence number incrementation
while MAC header generation. Upper layers like af_802154 or 6LoWPAN
could call this function in a parallel context while generating 802.15.4
MAC header before queuing into wpan interfaces transmit queue.

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 4a3a8c0c

include/net/cfg802154.h

+2 −2
Original line number Diff line number Diff line
@@ -177,9 +177,9 @@ struct wpan_dev { 
	__le64 extended_addr;



	/* MAC BSN field */

	u8 bsn;

	atomic_t bsn;

	/* MAC DSN field */

	u8 dsn;

	atomic_t dsn;



	u8 min_be;

	u8 max_be;

include/net/ieee802154_netdev.h

+0 −1
Original line number Diff line number Diff line
@@ -431,7 +431,6 @@ struct ieee802154_mlme_ops { 
	 */

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

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

	u8 (*get_dsn)(const struct net_device *dev);

};



static inline struct ieee802154_mlme_ops *

net/ieee802154/6lowpan/core.c

+0 −8
Original line number Diff line number Diff line
@@ -69,13 +69,6 @@ static __le16 lowpan_get_short_addr(const struct net_device *dev) 
	return ieee802154_mlme_ops(real_dev)->get_short_addr(real_dev);

}



static u8 lowpan_get_dsn(const struct net_device *dev)

{

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



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

}



static struct header_ops lowpan_header_ops = {

	.create	= lowpan_header_create,

};
@@ -106,7 +99,6 @@ static const struct net_device_ops lowpan_netdev_ops = { 
static struct ieee802154_mlme_ops lowpan_mlme = {

	.get_pan_id = lowpan_get_pan_id,

	.get_short_addr = lowpan_get_short_addr,

	.get_dsn = lowpan_get_dsn,

};



static void lowpan_setup(struct net_device *dev)

net/mac802154/ieee802154_i.h

+0 −1
Original line number Diff line number Diff line
@@ -141,7 +141,6 @@ __le16 mac802154_dev_get_short_addr(const struct net_device *dev); 
__le16 mac802154_dev_get_pan_id(const struct net_device *dev);

void mac802154_dev_set_pan_id(struct net_device *dev, __le16 val);

void mac802154_dev_set_page_channel(struct net_device *dev, u8 page, u8 chan);

u8 mac802154_dev_get_dsn(const struct net_device *dev);



int mac802154_get_params(struct net_device *dev,

			 struct ieee802154_llsec_params *params);

net/mac802154/iface.c

+6 −3
Original line number Diff line number Diff line
@@ -368,7 +368,7 @@ static int mac802154_header_create(struct sk_buff *skb, 
	hdr.fc.type = cb->type;

	hdr.fc.security_enabled = cb->secen;

	hdr.fc.ack_request = cb->ackreq;

	hdr.seq = ieee802154_mlme_ops(dev)->get_dsn(dev);

	hdr.seq = atomic_inc_return(&dev->ieee802154_ptr->dsn) & 0xFF;



	if (mac802154_set_header_security(sdata, &hdr, cb) < 0)

		return -EINVAL;
@@ -468,13 +468,16 @@ ieee802154_setup_sdata(struct ieee802154_sub_if_data *sdata, 
		       enum nl802154_iftype type)

{

	struct wpan_dev *wpan_dev = &sdata->wpan_dev;

	u8 tmp;



	/* set some type-dependent values */

	sdata->vif.type = type;

	sdata->wpan_dev.iftype = type;



	get_random_bytes(&wpan_dev->bsn, 1);

	get_random_bytes(&wpan_dev->dsn, 1);

	get_random_bytes(&tmp, sizeof(tmp));

	atomic_set(&wpan_dev->bsn, tmp);

	get_random_bytes(&tmp, sizeof(tmp));

	atomic_set(&wpan_dev->dsn, tmp);



	/* defaults per 802.15.4-2011 */

	wpan_dev->min_be = 3;