Merge tag 'v3.7-rc3' into next to sync up with recent USB and MFD changes

1 files changed, 32 insertions, 0 deletions

diff --git a/include/uapi/linux/if_addrlabel.h b/include/uapi/linux/if_addrlabel.h
new file mode 100644
index 000000000000..54580c298187
--- /dev/null
+++ b/include/uapi/linux/if_addrlabel.h
@@ -0,0 +1,32 @@
+/*
+ * if_addrlabel.h - netlink interface for address labels
+ *
+ * Copyright (C)2007 USAGI/WIDE Project,  All Rights Reserved.
+ *
+ * Authors:
+ *      YOSHIFUJI Hideaki @ USAGI/WIDE <yoshfuji@linux-ipv6.org>
+ */
+
+#ifndef __LINUX_IF_ADDRLABEL_H
+#define __LINUX_IF_ADDRLABEL_H
+
+#include <linux/types.h>
+
+struct ifaddrlblmsg {
+        __u8            ifal_family;            /* Address family */
+        __u8            __ifal_reserved;        /* Reserved */
+        __u8            ifal_prefixlen;         /* Prefix length */
+        __u8            ifal_flags;             /* Flags */
+        __u32           ifal_index;             /* Link index */
+        __u32           ifal_seq;               /* sequence number */
+};
+
+enum {
+        IFAL_ADDRESS = 1,
+        IFAL_LABEL = 2,
+        __IFAL_MAX
+};
+
+#define IFAL_MAX        (__IFAL_MAX - 1)
+
+#endif