diff options
| author | David S. Miller <davem@davemloft.net> | 2009-11-06 17:57:51 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-11-06 17:57:51 -0800 |
| commit | 10d626f4f444b419046309c10f25515adbffcb16 (patch) | |
| tree | 216b16bf872bf3b077895443919de0e487da2ea3 /include/linux | |
| parent | 62d83681e53fd87c91927018cfe5ba9f9e8109a3 (diff) | |
| parent | bb1cafb8fc414d6dbe933f888df6540c2ef02101 (diff) | |
| download | op-kernel-dev-10d626f4f444b419046309c10f25515adbffcb16.zip op-kernel-dev-10d626f4f444b419046309c10f25515adbffcb16.tar.gz | |
Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/lowpan/lowpan
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/nl802154.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/include/linux/nl802154.h b/include/linux/nl802154.h index b7d9435..33d9f51 100644 --- a/include/linux/nl802154.h +++ b/include/linux/nl802154.h @@ -65,6 +65,9 @@ enum { IEEE802154_ATTR_SEC, IEEE802154_ATTR_PAGE, + IEEE802154_ATTR_CHANNEL_PAGE_LIST, + + IEEE802154_ATTR_PHY_NAME, __IEEE802154_ATTR_MAX, }; @@ -114,6 +117,9 @@ enum { IEEE802154_RX_ENABLE_CONF, /* Not supported yet */ IEEE802154_LIST_IFACE, + IEEE802154_LIST_PHY, + IEEE802154_ADD_IFACE, + IEEE802154_DEL_IFACE, __IEEE802154_CMD_MAX, }; |
