Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6: (1244 commits)
  pkt_sched: Rename PSCHED_US2NS and PSCHED_NS2US
  ipv4: Fix fib_trie rebalancing
  Bluetooth: Fix issue with uninitialized nsh.type in DTL-1 driver
  Bluetooth: Fix Kconfig issue with RFKILL integration
  PIM-SM: namespace changes
  ipv4: update ARPD help text
  net: use a deferred timer in rt_check_expire
  ieee802154: fix kconfig bool/tristate muckup
  bonding: initialization rework
  bonding: use is_zero_ether_addr
  bonding: network device names are case sensative
  bonding: elminate bad refcount code
  bonding: fix style issues
  bonding: fix destructor
  bonding: remove bonding read/write semaphore
  bonding: initialize before registration
  bonding: bond_create always called with default parameters
  x_tables: Convert printk to pr_err
  netfilter: conntrack: optional reliable conntrack event delivery
  list_nulls: add hlist_nulls_add_head and hlist_nulls_del
  ...

1 files changed, 52 insertions, 0 deletions

diff --git a/net/ieee802154/nl_policy.c b/net/ieee802154/nl_policy.c
new file mode 100644
index 000000000000..c7d71d1adcac
--- /dev/null
+++ b/net/ieee802154/nl_policy.c
@@ -0,0 +1,52 @@
+/*
+ * nl802154.h
+ *
+ * Copyright (C) 2007, 2008 Siemens AG
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2
+ * as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ */
+
+#include <linux/kernel.h>
+#include <net/netlink.h>
+#include <linux/nl802154.h>
+
+#define NLA_HW_ADDR NLA_U64
+
+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_STATUS] = { .type = NLA_U8, },
+        [IEEE802154_ATTR_SHORT_ADDR] = { .type = NLA_U16, },
+        [IEEE802154_ATTR_HW_ADDR] = { .type = NLA_HW_ADDR, },
+        [IEEE802154_ATTR_PAN_ID] = { .type = NLA_U16, },
+        [IEEE802154_ATTR_CHANNEL] = { .type = NLA_U8, },
+        [IEEE802154_ATTR_COORD_SHORT_ADDR] = { .type = NLA_U16, },
+        [IEEE802154_ATTR_COORD_HW_ADDR] = { .type = NLA_HW_ADDR, },
+        [IEEE802154_ATTR_COORD_PAN_ID] = { .type = NLA_U16, },
+        [IEEE802154_ATTR_SRC_SHORT_ADDR] = { .type = NLA_U16, },
+        [IEEE802154_ATTR_SRC_HW_ADDR] = { .type = NLA_HW_ADDR, },
+        [IEEE802154_ATTR_SRC_PAN_ID] = { .type = NLA_U16, },
+        [IEEE802154_ATTR_DEST_SHORT_ADDR] = { .type = NLA_U16, },
+        [IEEE802154_ATTR_DEST_HW_ADDR] = { .type = NLA_HW_ADDR, },
+        [IEEE802154_ATTR_DEST_PAN_ID] = { .type = NLA_U16, },
+
+        [IEEE802154_ATTR_CAPABILITY] = { .type = NLA_U8, },
+        [IEEE802154_ATTR_REASON] = { .type = NLA_U8, },
+        [IEEE802154_ATTR_SCAN_TYPE] = { .type = NLA_U8, },
+        [IEEE802154_ATTR_CHANNELS] = { .type = NLA_U32, },
+        [IEEE802154_ATTR_DURATION] = { .type = NLA_U8, },
+        [IEEE802154_ATTR_ED_LIST] = { .len = 27 },
+};