Merge branch 'sched/urgent' into sched/core, to avoid conflicts

Signed-off-by: Ingo Molnar <mingo@kernel.org>

1 files changed, 6 insertions, 0 deletions

diff --git a/include/uapi/linux/netdevice.h b/include/uapi/linux/netdevice.h
index 6b9500bc2d56..fdfbd1c17065 100644
--- a/include/uapi/linux/netdevice.h
+++ b/include/uapi/linux/netdevice.h
@@ -49,5 +49,11 @@ enum {
         IF_PORT_100BASEFX
 };
 
+/* hardware address assignment types */
+#define NET_ADDR_PERM           0       /* address is permanent (default) */
+#define NET_ADDR_RANDOM         1       /* address is generated randomly */
+#define NET_ADDR_STOLEN         2       /* address is stolen from other device */
+#define NET_ADDR_SET            3       /* address is set using
+                                         * dev_set_mac_address() */
 
 #endif /* _UAPI_LINUX_NETDEVICE_H */