Update kernel headers to net-next

diff --git a/include/linux/can/netlink.h b/include/linux/can/netlink.h
index 295cd40924261bc0814232c59b0e1bfbc12f89bb..25fd52cc9c421212813a6155d7ea73cd16cde265 100644 (file)
--- a/include/linux/can/netlink.h
+++ b/include/linux/can/netlink.h
@@ -92,11 +92,12 @@ struct can_ctrlmode {
 };
 
 #define CAN_CTRLMODE_LOOPBACK          0x01    /* Loopback mode */
-#define CAN_CTRLMODE_LISTENONLY                0x02    /* Listen-only mode */
+#define CAN_CTRLMODE_LISTENONLY                0x02    /* Listen-only mode */
 #define CAN_CTRLMODE_3_SAMPLES         0x04    /* Triple sampling mode */
 #define CAN_CTRLMODE_ONE_SHOT          0x08    /* One-Shot mode */
 #define CAN_CTRLMODE_BERR_REPORTING    0x10    /* Bus-error reporting */
 #define CAN_CTRLMODE_FD                        0x20    /* CAN FD mode */
+#define CAN_CTRLMODE_PRESUME_ACK       0x40    /* Ignore missing CAN ACKs */
 
 /*
  * CAN device statistics

diff --git a/include/linux/if_link.h b/include/linux/if_link.h
index fadef0fd7850a01649583dd3a1dc79c133eb1eb8..39cb62ce1e4d542bdfb9d5b78eadca281809992e 100644 (file)
--- a/include/linux/if_link.h
+++ b/include/linux/if_link.h
@@ -202,11 +202,17 @@ enum {
        IFLA_INET6_CACHEINFO,   /* time values and max reasm size */
        IFLA_INET6_ICMP6STATS,  /* statistics (icmpv6)          */
        IFLA_INET6_TOKEN,       /* device token                 */
+       IFLA_INET6_ADDR_GEN_MODE, /* implicit address generator mode */
        __IFLA_INET6_MAX
 };
 
 #define IFLA_INET6_MAX (__IFLA_INET6_MAX - 1)
 
+enum in6_addr_gen_mode {
+       IN6_ADDR_GEN_MODE_EUI64,
+       IN6_ADDR_GEN_MODE_NONE,
+};
+
 enum {
        BRIDGE_MODE_UNSPEC,
        BRIDGE_MODE_HAIRPIN,

diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h
index 7708f953aff7de6789d1911397f5abc0da153343..66fceb4423392bcdeeefb0f413115989c7d31c8f 100644 (file)
--- a/include/linux/netdevice.h
+++ b/include/linux/netdevice.h
@@ -37,6 +37,12 @@
 #define INIT_NETDEV_GROUP      0
 
 
+/* interface name assignment types (sysfs name_assign_type attribute) */
+#define NET_NAME_UNKNOWN       0       /* unknown origin (not exposed to userspace) */
+#define NET_NAME_ENUM          1       /* enumerated by kernel */
+#define NET_NAME_PREDICTABLE   2       /* predictably named by the kernel */
+#define NET_NAME_USER          3       /* provided by user-space */
+#define NET_NAME_RENAMED       4       /* renamed by user-space */
 
 /* Media selection options. */
 enum {