Merge branches 'acpica-fixes', 'acpi-pci-fixes' and 'acpi-debug-fixes'

[deliverable/linux.git] / include / uapi / linux / neighbour.h

diff --git a/include/uapi/linux/neighbour.h b/include/uapi/linux/neighbour.h
index 788655bfa0f3001d549e90c8fe5dd811600e3a98..bd99a8d80f36e527094f05ceabb55c21ea004ae7 100644 (file)
--- a/include/uapi/linux/neighbour.h
+++ b/include/uapi/linux/neighbour.h
@@ -128,6 +128,7 @@ enum {
        NDTPA_LOCKTIME,                 /* u64, msecs */
        NDTPA_QUEUE_LENBYTES,           /* u32 */
        NDTPA_MCAST_REPROBES,           /* u32 */
+       NDTPA_PAD,
        __NDTPA_MAX
 };
 #define NDTPA_MAX (__NDTPA_MAX - 1)
@@ -160,6 +161,7 @@ enum {
        NDTA_PARMS,                     /* nested TLV NDTPA_* */
        NDTA_STATS,                     /* struct ndt_stats, read-only */
        NDTA_GC_INTERVAL,               /* u64, msecs */
+       NDTA_PAD,
        __NDTA_MAX
 };
 #define NDTA_MAX (__NDTA_MAX - 1)