Skip to content

Commit

Permalink
nl802154: support START-CONFIRM primitive
Browse files Browse the repository at this point in the history
Signed-off-by: Dmitry Eremin-Solenikov <[email protected]>
Signed-off-by: David S. Miller <[email protected]>
  • Loading branch information
lumag authored and davem330 committed Aug 13, 2009
1 parent 99eb855 commit acb8aac
Show file tree
Hide file tree
Showing 2 changed files with 41 additions and 0 deletions.
9 changes: 9 additions & 0 deletions include/net/nl802154.h
Original file line number Diff line number Diff line change
Expand Up @@ -114,4 +114,13 @@ int ieee802154_nl_scan_confirm(struct net_device *dev,
int ieee802154_nl_beacon_indic(struct net_device *dev, u16 panid,
u16 coord_addr);

/**
* ieee802154_nl_start_confirm - Notify userland of completion of start.
* @dev: The device which was instructed to scan.
* @status: The status of the scan operation.
*
* Note: This is in section 7.1.14 of the IEEE 802.15.4 document.
*/
int ieee802154_nl_start_confirm(struct net_device *dev, u8 status);

#endif
32 changes: 32 additions & 0 deletions net/ieee802154/netlink.c
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@
#include <linux/nl802154.h>
#include <net/af_ieee802154.h>
#include <net/nl802154.h>
#include <net/ieee802154.h>
#include <net/ieee802154_netdev.h>

static unsigned int ieee802154_seq_num;
Expand Down Expand Up @@ -262,6 +263,31 @@ int ieee802154_nl_scan_confirm(struct net_device *dev,
}
EXPORT_SYMBOL(ieee802154_nl_scan_confirm);

int ieee802154_nl_start_confirm(struct net_device *dev, u8 status)
{
struct sk_buff *msg;

pr_debug("%s\n", __func__);

msg = ieee802154_nl_create(0, IEEE802154_START_CONF);
if (!msg)
return -ENOBUFS;

NLA_PUT_STRING(msg, IEEE802154_ATTR_DEV_NAME, dev->name);
NLA_PUT_U32(msg, IEEE802154_ATTR_DEV_INDEX, dev->ifindex);
NLA_PUT(msg, IEEE802154_ATTR_HW_ADDR, IEEE802154_ADDR_LEN,
dev->dev_addr);

NLA_PUT_U8(msg, IEEE802154_ATTR_STATUS, status);

return ieee802154_nl_finish(msg);

nla_put_failure:
nlmsg_free(msg);
return -ENOBUFS;
}
EXPORT_SYMBOL(ieee802154_nl_start_confirm);

static int ieee802154_nl_fill_iface(struct sk_buff *msg, u32 pid,
u32 seq, int flags, struct net_device *dev)
{
Expand Down Expand Up @@ -462,6 +488,12 @@ 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 (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,
bcn_ord, sf_ord, pan_coord, blx, coord_realign);

Expand Down

0 comments on commit acb8aac

Please sign in to comment.