Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

[karo-tx-linux.git] / net / ieee802154 / nl_policy.c

diff --git a/net/ieee802154/nl_policy.c b/net/ieee802154/nl_policy.c
index 2363ebee02e7c1b55a569e281a5b7d7f36078e90..6adda4d46f95255d6540f639e383c9985a949138 100644 (file)
--- a/net/ieee802154/nl_policy.c
+++ b/net/ieee802154/nl_policy.c
@@ -27,6 +27,7 @@
 const struct nla_policy ieee802154_policy[IEEE802154_ATTR_MAX + 1] = {
        [IEEE802154_ATTR_DEV_NAME] = { .type = NLA_STRING, },
        [IEEE802154_ATTR_DEV_INDEX] = { .type = NLA_U32, },
+       [IEEE802154_ATTR_PHY_NAME] = { .type = NLA_STRING, },
 
        [IEEE802154_ATTR_STATUS] = { .type = NLA_U8, },
        [IEEE802154_ATTR_SHORT_ADDR] = { .type = NLA_U16, },
@@ -50,5 +51,6 @@ const struct nla_policy ieee802154_policy[IEEE802154_ATTR_MAX + 1] = {
        [IEEE802154_ATTR_CHANNELS] = { .type = NLA_U32, },
        [IEEE802154_ATTR_DURATION] = { .type = NLA_U8, },
        [IEEE802154_ATTR_ED_LIST] = { .len = 27 },
+       [IEEE802154_ATTR_CHANNEL_PAGE_LIST] = { .len = 32 * 4, },
 };