From: Stephen Hemminger <stephen@networkplumber.org>
Date: Mon, 21 Apr 2014 15:26:44 +0000 (-0700)
Subject: Update to 3.15-rc2 headers
X-Git-Tag: v3.15.0~28
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ce3436ca05ee2a9f4bf4c5b10eb25638865772cb;p=thirdparty%2Fiproute2.git

Update to 3.15-rc2 headers
---

diff --git a/include/linux/if_link.h b/include/linux/if_link.h
index f08505c36..84fca1e75 100644
--- a/include/linux/if_link.h
+++ b/include/linux/if_link.h
@@ -144,6 +144,7 @@ enum {
 	IFLA_NUM_RX_QUEUES,
 	IFLA_CARRIER,
 	IFLA_PHYS_PORT_ID,
+	IFLA_CARRIER_CHANGES,
 	__IFLA_MAX
 };
 
diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h
index adc726075..7708f953a 100644
--- a/include/linux/netdevice.h
+++ b/include/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 /* _LINUX_NETDEVICE_H */