diff options
author | David S. Miller <davem@davemloft.net> | 2009-11-06 20:57:51 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2009-11-06 20:57:51 -0500 |
commit | 10d626f4f444b419046309c10f25515adbffcb16 (patch) | |
tree | 216b16bf872bf3b077895443919de0e487da2ea3 /include/linux | |
parent | 62d83681e53fd87c91927018cfe5ba9f9e8109a3 (diff) | |
parent | bb1cafb8fc414d6dbe933f888df6540c2ef02101 (diff) |
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 b7d9435d5a9f..33d9f5175109 100644 --- a/include/linux/nl802154.h +++ b/include/linux/nl802154.h | |||
@@ -65,6 +65,9 @@ enum { | |||
65 | IEEE802154_ATTR_SEC, | 65 | IEEE802154_ATTR_SEC, |
66 | 66 | ||
67 | IEEE802154_ATTR_PAGE, | 67 | IEEE802154_ATTR_PAGE, |
68 | IEEE802154_ATTR_CHANNEL_PAGE_LIST, | ||
69 | |||
70 | IEEE802154_ATTR_PHY_NAME, | ||
68 | 71 | ||
69 | __IEEE802154_ATTR_MAX, | 72 | __IEEE802154_ATTR_MAX, |
70 | }; | 73 | }; |
@@ -114,6 +117,9 @@ enum { | |||
114 | IEEE802154_RX_ENABLE_CONF, /* Not supported yet */ | 117 | IEEE802154_RX_ENABLE_CONF, /* Not supported yet */ |
115 | 118 | ||
116 | IEEE802154_LIST_IFACE, | 119 | IEEE802154_LIST_IFACE, |
120 | IEEE802154_LIST_PHY, | ||
121 | IEEE802154_ADD_IFACE, | ||
122 | IEEE802154_DEL_IFACE, | ||
117 | 123 | ||
118 | __IEEE802154_CMD_MAX, | 124 | __IEEE802154_CMD_MAX, |
119 | }; | 125 | }; |