Update to 3.15-rc2 headers

diff --git a/include/linux/if_link.h b/include/linux/if_link.h
index f08505c367e10f2c8280f34921c6f7ba654d4b50..84fca1e75e666800fa0937dd3ee055a623a73f0c 100644 (file)
--- 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 adc726075b12a626ce9e0de20e8678cbbad6e5d7..7708f953aff7de6789d1911397f5abc0da153343 100644 (file)
--- 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 */