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

Commit 16eea493 authored by Dmitry Eremin-Solenikov's avatar Dmitry Eremin-Solenikov
Browse files

ieee802154: add support for channel pages from IEEE 802.15.4-2006 



IEEE 802.15.4-2006 adds new concept: channel pages, which can contain several
channels. Add support for channel pages in the API and in the fakehard driver.

Signed-off-by: default avatarDmitry Eremin-Solenikov <dbaryshkov@gmail.com>
parent 81f95103

drivers/ieee802154/fakehard.c

+6 −4
Original line number Diff line number Diff line
@@ -119,12 +119,13 @@ static u8 fake_get_bsn(struct net_device *dev) 
 *       802.15.4-2006 document.

 */

static int fake_assoc_req(struct net_device *dev,

		struct ieee802154_addr *addr, u8 channel, u8 cap)

		struct ieee802154_addr *addr, u8 channel, u8 page, u8 cap)

{

	struct wpan_phy *phy = net_to_phy(dev);



	mutex_lock(&phy->pib_lock);

	phy->current_channel = channel;

	phy->current_page = page;

	mutex_unlock(&phy->pib_lock);



	/* We simply emulate it here */
@@ -191,7 +192,7 @@ static int fake_disassoc_req(struct net_device *dev, 
 * document, with 7.3.8 describing coordinator realignment.

 */

static int fake_start_req(struct net_device *dev, struct ieee802154_addr *addr,

				u8 channel,

				u8 channel, u8 page,

				u8 bcn_ord, u8 sf_ord, u8 pan_coord, u8 blx,

				u8 coord_realign)

{
@@ -199,6 +200,7 @@ static int fake_start_req(struct net_device *dev, struct ieee802154_addr *addr, 


	mutex_lock(&phy->pib_lock);

	phy->current_channel = channel;

	phy->current_page = page;

	mutex_unlock(&phy->pib_lock);



	/* We don't emulate beacons here at all, so START should fail */
@@ -222,11 +224,11 @@ static int fake_start_req(struct net_device *dev, struct ieee802154_addr *addr, 
 * Note: This is in section 7.5.2.1 of the IEEE 802.15.4-2006 document.

 */

static int fake_scan_req(struct net_device *dev, u8 type, u32 channels,

		u8 duration)

		u8 page, u8 duration)

{

	u8 edl[27] = {};

	return ieee802154_nl_scan_confirm(dev, IEEE802154_SUCCESS, type,

			channels,

			channels, page,

			type == IEEE802154_MAC_SCAN_ED ? edl : NULL);

}

include/linux/nl802154.h

+2 −0
Original line number Diff line number Diff line
@@ -64,6 +64,8 @@ enum { 
	IEEE802154_ATTR_COORD_REALIGN,

	IEEE802154_ATTR_SEC,



	IEEE802154_ATTR_PAGE,



	__IEEE802154_ATTR_MAX,

};

include/net/ieee802154_netdev.h

+3 −3
Original line number Diff line number Diff line
@@ -80,7 +80,7 @@ static inline int mac_cb_type(struct sk_buff *skb) 
struct ieee802154_mlme_ops {

	int (*assoc_req)(struct net_device *dev,

			struct ieee802154_addr *addr,

			u8 channel, u8 cap);

			u8 channel, u8 page, u8 cap);

	int (*assoc_resp)(struct net_device *dev,

			struct ieee802154_addr *addr,

			u16 short_addr, u8 status);
@@ -89,10 +89,10 @@ struct ieee802154_mlme_ops { 
			u8 reason);

	int (*start_req)(struct net_device *dev,

			struct ieee802154_addr *addr,

			u8 channel, u8 bcn_ord, u8 sf_ord,

			u8 channel, u8 page, u8 bcn_ord, u8 sf_ord,

			u8 pan_coord, u8 blx, u8 coord_realign);

	int (*scan_req)(struct net_device *dev,

			u8 type, u32 channels, u8 duration);

			u8 type, u32 channels, u8 page, u8 duration);



	/*

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

include/net/nl802154.h

+1 −1
Original line number Diff line number Diff line
@@ -95,7 +95,7 @@ int ieee802154_nl_disassoc_confirm(struct net_device *dev, 
 * Note: This API does not permit the return of an active scan result.

 */

int ieee802154_nl_scan_confirm(struct net_device *dev,

		u8 status, u8 scan_type, u32 unscanned,

		u8 status, u8 scan_type, u32 unscanned, u8 page,

		u8 *edl/*, struct list_head *pan_desc_list */);



/**

net/ieee802154/netlink.c

+25 −3
Original line number Diff line number Diff line
@@ -232,7 +232,7 @@ nla_put_failure: 
EXPORT_SYMBOL(ieee802154_nl_beacon_indic);



int ieee802154_nl_scan_confirm(struct net_device *dev,

		u8 status, u8 scan_type, u32 unscanned,

		u8 status, u8 scan_type, u32 unscanned, u8 page,

		u8 *edl/* , struct list_head *pan_desc_list */)

{

	struct sk_buff *msg;
@@ -251,6 +251,7 @@ int ieee802154_nl_scan_confirm(struct net_device *dev, 
	NLA_PUT_U8(msg, IEEE802154_ATTR_STATUS, status);

	NLA_PUT_U8(msg, IEEE802154_ATTR_SCAN_TYPE, scan_type);

	NLA_PUT_U32(msg, IEEE802154_ATTR_CHANNELS, unscanned);

	NLA_PUT_U8(msg, IEEE802154_ATTR_PAGE, page);



	if (edl)

		NLA_PUT(msg, IEEE802154_ATTR_ED_LIST, 27, edl);
@@ -349,6 +350,7 @@ static int ieee802154_associate_req(struct sk_buff *skb, 
{

	struct net_device *dev;

	struct ieee802154_addr addr;

	u8 page;

	int ret = -EINVAL;



	if (!info->attrs[IEEE802154_ATTR_CHANNEL] ||
@@ -374,8 +376,14 @@ static int ieee802154_associate_req(struct sk_buff *skb, 
	}

	addr.pan_id = nla_get_u16(info->attrs[IEEE802154_ATTR_COORD_PAN_ID]);



	if (info->attrs[IEEE802154_ATTR_PAGE])

		page = nla_get_u8(info->attrs[IEEE802154_ATTR_PAGE]);

	else

		page = 0;



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

			nla_get_u8(info->attrs[IEEE802154_ATTR_CHANNEL]),

			page,

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



	dev_put(dev);
@@ -458,6 +466,7 @@ static int ieee802154_start_req(struct sk_buff *skb, struct genl_info *info) 
	struct ieee802154_addr addr;



	u8 channel, bcn_ord, sf_ord;

	u8 page;

	int pan_coord, blx, coord_realign;

	int ret;
@@ -488,13 +497,19 @@ static int ieee802154_start_req(struct sk_buff *skb, struct genl_info *info) 
	blx = nla_get_u8(info->attrs[IEEE802154_ATTR_BAT_EXT]);

	coord_realign = nla_get_u8(info->attrs[IEEE802154_ATTR_COORD_REALIGN]);



	if (info->attrs[IEEE802154_ATTR_PAGE])

		page = nla_get_u8(info->attrs[IEEE802154_ATTR_PAGE]);

	else

		page = 0;





	if (addr.short_addr == IEEE802154_ADDR_BROADCAST) {

		ieee802154_nl_start_confirm(dev, IEEE802154_NO_SHORT_ADDRESS);

		dev_put(dev);

		return -EINVAL;

	}



	ret = ieee802154_mlme_ops(dev)->start_req(dev, &addr, channel,

	ret = ieee802154_mlme_ops(dev)->start_req(dev, &addr, channel, page,

		bcn_ord, sf_ord, pan_coord, blx, coord_realign);



	dev_put(dev);
@@ -508,6 +523,7 @@ static int ieee802154_scan_req(struct sk_buff *skb, struct genl_info *info) 
	u8 type;

	u32 channels;

	u8 duration;

	u8 page;



	if (!info->attrs[IEEE802154_ATTR_SCAN_TYPE] ||

	    !info->attrs[IEEE802154_ATTR_CHANNELS] ||
@@ -522,7 +538,13 @@ static int ieee802154_scan_req(struct sk_buff *skb, struct genl_info *info) 
	channels = nla_get_u32(info->attrs[IEEE802154_ATTR_CHANNELS]);

	duration = nla_get_u8(info->attrs[IEEE802154_ATTR_DURATION]);



	ret = ieee802154_mlme_ops(dev)->scan_req(dev, type, channels,

	if (info->attrs[IEEE802154_ATTR_PAGE])

		page = nla_get_u8(info->attrs[IEEE802154_ATTR_PAGE]);

	else

		page = 0;





	ret = ieee802154_mlme_ops(dev)->scan_req(dev, type, channels, page,

			duration);



	dev_put(dev);