lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Browse Source 
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: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>
This commit is contained in:
Dmitry Eremin-Solenikov
2009-08-19 19:32:24 +04:00
parent 81f9510381
commit 16eea493da
6 changed files with 38 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
drivers/ieee802154/fakehard.c
View File

@@ -119,12 +119,13 @@ static u8 fake_get_bsn(struct net_device *dev)
* 802.15.4-2006 document. * 802.15.4-2006 document.
*/ */
static int fake_assoc_req(struct net_device *dev, 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); struct wpan_phy *phy = net_to_phy(dev);
mutex_lock(&phy->pib_lock); mutex_lock(&phy->pib_lock);
phy->current_channel = channel; phy->current_channel = channel;
phy->current_page = page;
mutex_unlock(&phy->pib_lock); mutex_unlock(&phy->pib_lock);
/* We simply emulate it here */ /* 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. * document, with 7.3.8 describing coordinator realignment.
*/ */
static int fake_start_req(struct net_device *dev, struct ieee802154_addr *addr, 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 bcn_ord, u8 sf_ord, u8 pan_coord, u8 blx,
u8 coord_realign) 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); mutex_lock(&phy->pib_lock);
phy->current_channel = channel; phy->current_channel = channel;
phy->current_page = page;
mutex_unlock(&phy->pib_lock); mutex_unlock(&phy->pib_lock);
/* We don't emulate beacons here at all, so START should fail */ /* 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. * 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, static int fake_scan_req(struct net_device *dev, u8 type, u32 channels,
u8 duration) u8 page, u8 duration)
{ {
u8 edl[27] = {}; u8 edl[27] = {};
return ieee802154_nl_scan_confirm(dev, IEEE802154_SUCCESS, type, return ieee802154_nl_scan_confirm(dev, IEEE802154_SUCCESS, type,
channels, channels, page,
type == IEEE802154_MAC_SCAN_ED ? edl : NULL); type == IEEE802154_MAC_SCAN_ED ? edl : NULL);
} }

2
include/linux/nl802154.h
View File

@@ -64,6 +64,8 @@ enum {
IEEE802154_ATTR_COORD_REALIGN, IEEE802154_ATTR_COORD_REALIGN,
IEEE802154_ATTR_SEC, IEEE802154_ATTR_SEC,
IEEE802154_ATTR_PAGE,
__IEEE802154_ATTR_MAX, __IEEE802154_ATTR_MAX,
}; };

6
include/net/ieee802154_netdev.h
View File

@@ -80,7 +80,7 @@ static inline int mac_cb_type(struct sk_buff *skb)
struct ieee802154_mlme_ops { struct ieee802154_mlme_ops {
int (*assoc_req)(struct net_device *dev, int (*assoc_req)(struct net_device *dev,
struct ieee802154_addr *addr, struct ieee802154_addr *addr,
u8 channel, u8 cap); u8 channel, u8 page, u8 cap);
int (*assoc_resp)(struct net_device *dev, int (*assoc_resp)(struct net_device *dev,
struct ieee802154_addr *addr, struct ieee802154_addr *addr,
u16 short_addr, u8 status); u16 short_addr, u8 status);
@@ -89,10 +89,10 @@ struct ieee802154_mlme_ops {
u8 reason); u8 reason);
int (*start_req)(struct net_device *dev, int (*start_req)(struct net_device *dev,
struct ieee802154_addr *addr, 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); u8 pan_coord, u8 blx, u8 coord_realign);
int (*scan_req)(struct net_device *dev, 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. * FIXME: these should become the part of PIB/MIB interface.

2
include/net/nl802154.h
View File

@@ -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. * Note: This API does not permit the return of an active scan result.
*/ */
int ieee802154_nl_scan_confirm(struct net_device *dev, 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 */); u8 *edl/*, struct list_head *pan_desc_list */);
/** /**

28
net/ieee802154/netlink.c
View File

@@ -232,7 +232,7 @@ nla_put_failure:
EXPORT_SYMBOL(ieee802154_nl_beacon_indic); EXPORT_SYMBOL(ieee802154_nl_beacon_indic);
int ieee802154_nl_scan_confirm(struct net_device *dev, 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 */) u8 *edl/* , struct list_head *pan_desc_list */)
{ {
struct sk_buff *msg; 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_STATUS, status);
NLA_PUT_U8(msg, IEEE802154_ATTR_SCAN_TYPE, scan_type); NLA_PUT_U8(msg, IEEE802154_ATTR_SCAN_TYPE, scan_type);
NLA_PUT_U32(msg, IEEE802154_ATTR_CHANNELS, unscanned); NLA_PUT_U32(msg, IEEE802154_ATTR_CHANNELS, unscanned);
NLA_PUT_U8(msg, IEEE802154_ATTR_PAGE, page);
if (edl) if (edl)
NLA_PUT(msg, IEEE802154_ATTR_ED_LIST, 27, 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 net_device *dev;
struct ieee802154_addr addr; struct ieee802154_addr addr;
u8 page;
int ret = -EINVAL; int ret = -EINVAL;
if (!info->attrs[IEEE802154_ATTR_CHANNEL] || 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]); 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, ret = ieee802154_mlme_ops(dev)->assoc_req(dev, &addr,
nla_get_u8(info->attrs[IEEE802154_ATTR_CHANNEL]), nla_get_u8(info->attrs[IEEE802154_ATTR_CHANNEL]),
page,
nla_get_u8(info->attrs[IEEE802154_ATTR_CAPABILITY])); nla_get_u8(info->attrs[IEEE802154_ATTR_CAPABILITY]));
dev_put(dev); dev_put(dev);
@@ -458,6 +466,7 @@ static int ieee802154_start_req(struct sk_buff *skb, struct genl_info *info)
struct ieee802154_addr addr; struct ieee802154_addr addr;
u8 channel, bcn_ord, sf_ord; u8 channel, bcn_ord, sf_ord;
u8 page;
int pan_coord, blx, coord_realign; int pan_coord, blx, coord_realign;
int ret; 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]); blx = nla_get_u8(info->attrs[IEEE802154_ATTR_BAT_EXT]);
coord_realign = nla_get_u8(info->attrs[IEEE802154_ATTR_COORD_REALIGN]); 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) { if (addr.short_addr == IEEE802154_ADDR_BROADCAST) {
ieee802154_nl_start_confirm(dev, IEEE802154_NO_SHORT_ADDRESS); ieee802154_nl_start_confirm(dev, IEEE802154_NO_SHORT_ADDRESS);
dev_put(dev); dev_put(dev);
return -EINVAL; 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); bcn_ord, sf_ord, pan_coord, blx, coord_realign);
dev_put(dev); dev_put(dev);
@@ -508,6 +523,7 @@ static int ieee802154_scan_req(struct sk_buff *skb, struct genl_info *info)
u8 type; u8 type;
u32 channels; u32 channels;
u8 duration; u8 duration;
u8 page;
if (!info->attrs[IEEE802154_ATTR_SCAN_TYPE] || if (!info->attrs[IEEE802154_ATTR_SCAN_TYPE] ||
!info->attrs[IEEE802154_ATTR_CHANNELS] || !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]); channels = nla_get_u32(info->attrs[IEEE802154_ATTR_CHANNELS]);
duration = nla_get_u8(info->attrs[IEEE802154_ATTR_DURATION]); 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); duration);
dev_put(dev); dev_put(dev);

1
net/ieee802154/nl_policy.c
View File

@@ -33,6 +33,7 @@ const struct nla_policy ieee802154_policy[IEEE802154_ATTR_MAX + 1] = {
[IEEE802154_ATTR_HW_ADDR] = { .type = NLA_HW_ADDR, }, [IEEE802154_ATTR_HW_ADDR] = { .type = NLA_HW_ADDR, },
[IEEE802154_ATTR_PAN_ID] = { .type = NLA_U16, }, [IEEE802154_ATTR_PAN_ID] = { .type = NLA_U16, },
[IEEE802154_ATTR_CHANNEL] = { .type = NLA_U8, }, [IEEE802154_ATTR_CHANNEL] = { .type = NLA_U8, },
[IEEE802154_ATTR_PAGE] = { .type = NLA_U8, },
[IEEE802154_ATTR_COORD_SHORT_ADDR] = { .type = NLA_U16, }, [IEEE802154_ATTR_COORD_SHORT_ADDR] = { .type = NLA_U16, },
[IEEE802154_ATTR_COORD_HW_ADDR] = { .type = NLA_HW_ADDR, }, [IEEE802154_ATTR_COORD_HW_ADDR] = { .type = NLA_HW_ADDR, },
[IEEE802154_ATTR_COORD_PAN_ID] = { .type = NLA_U16, }, [IEEE802154_ATTR_COORD_PAN_ID] = { .type = NLA_U16, },