Update to current net-next kernel headers

Update sanitized headers

diff --git a/include/linux/can.h b/include/linux/can.h
index 5d9d1d1407180a9291c0f986945e3a34f2ccf51e..d9ba97f3252db22f8265e3e195948cb3e55f2a99 100644 (file)
--- a/include/linux/can.h
+++ b/include/linux/can.h
@@ -42,8 +42,8 @@
  * DAMAGE.
  */
 
-#ifndef CAN_H
-#define CAN_H
+#ifndef _CAN_H
+#define _CAN_H
 
 #include <linux/types.h>
 #include <linux/socket.h>
@@ -191,4 +191,4 @@ struct can_filter {
 
 #define CAN_INV_FILTER 0x20000000U /* to be set in can_filter.can_id */
 
-#endif /* CAN_H */
+#endif /* !_UAPI_CAN_H */

diff --git a/include/linux/can/netlink.h b/include/linux/can/netlink.h
index 7e2e1863db16e02fa15e1edc109adefda8236ba7..295cd40924261bc0814232c59b0e1bfbc12f89bb 100644 (file)
--- a/include/linux/can/netlink.h
+++ b/include/linux/can/netlink.h
@@ -15,8 +15,8 @@
  * GNU General Public License for more details.
  */
 
-#ifndef CAN_NETLINK_H
-#define CAN_NETLINK_H
+#ifndef _CAN_NETLINK_H
+#define _CAN_NETLINK_H
 
 #include <linux/types.h>
 
@@ -130,4 +130,4 @@ enum {
 
 #define IFLA_CAN_MAX   (__IFLA_CAN_MAX - 1)
 
-#endif /* CAN_NETLINK_H */
+#endif /* !_UAPI_CAN_NETLINK_H */

diff --git a/include/linux/filter.h b/include/linux/filter.h
index 9a46cb63ed6c68f32b2d06b857d1bfd4bcd401a6..a9ae93c0f4a86a2e9adc5c88b05f7fb89dfef65e 100644 (file)
--- a/include/linux/filter.h
+++ b/include/linux/filter.h
@@ -130,7 +130,8 @@ struct sock_fprog { /* Required for SO_ATTACH_FILTER. */
 #define SKF_AD_VLAN_TAG        44
 #define SKF_AD_VLAN_TAG_PRESENT 48
 #define SKF_AD_PAY_OFFSET      52
-#define SKF_AD_MAX     56
+#define SKF_AD_RANDOM  56
+#define SKF_AD_MAX     60
 #define SKF_NET_OFF   (-0x100000)
 #define SKF_LL_OFF    (-0x200000)
 

diff --git a/include/linux/if_link.h b/include/linux/if_link.h
index 84fca1e75e666800fa0937dd3ee055a623a73f0c..fadef0fd7850a01649583dd3a1dc79c133eb1eb8 100644 (file)
--- a/include/linux/if_link.h
+++ b/include/linux/if_link.h
@@ -317,6 +317,9 @@ enum {
        IFLA_VXLAN_PORT,        /* destination port */
        IFLA_VXLAN_GROUP6,
        IFLA_VXLAN_LOCAL6,
+       IFLA_VXLAN_UDP_CSUM,
+       IFLA_VXLAN_UDP_ZERO_CSUM6_TX,
+       IFLA_VXLAN_UDP_ZERO_CSUM6_RX,
        __IFLA_VXLAN_MAX
 };
 #define IFLA_VXLAN_MAX (__IFLA_VXLAN_MAX - 1)
@@ -397,9 +400,10 @@ enum {
        IFLA_VF_UNSPEC,
        IFLA_VF_MAC,            /* Hardware queue specific attributes */
        IFLA_VF_VLAN,
-       IFLA_VF_TX_RATE,        /* TX Bandwidth Allocation */
+       IFLA_VF_TX_RATE,        /* Max TX Bandwidth Allocation */
        IFLA_VF_SPOOFCHK,       /* Spoof Checking on/off switch */
        IFLA_VF_LINK_STATE,     /* link state enable/disable/auto switch */
+       IFLA_VF_RATE,           /* Min and Max TX Bandwidth Allocation */
        __IFLA_VF_MAX,
 };
 
@@ -421,6 +425,12 @@ struct ifla_vf_tx_rate {
        __u32 rate; /* Max TX bandwidth in Mbps, 0 disables throttling */
 };
 
+struct ifla_vf_rate {
+       __u32 vf;
+       __u32 min_tx_rate; /* Min Bandwidth in Mbps */
+       __u32 max_tx_rate; /* Max Bandwidth in Mbps */
+};
+
 struct ifla_vf_spoofchk {
        __u32 vf;
        __u32 setting;

diff --git a/include/linux/l2tp.h b/include/linux/l2tp.h
index c4bec82302a17167c88957073814231600412606..c0e116a4073ae65f75a27b251c6be29e24061ffe 100644 (file)
--- a/include/linux/l2tp.h
+++ b/include/linux/l2tp.h
@@ -122,6 +122,8 @@ enum {
        L2TP_ATTR_STATS,                /* nested */
        L2TP_ATTR_IP6_SADDR,            /* struct in6_addr */
        L2TP_ATTR_IP6_DADDR,            /* struct in6_addr */
+       L2TP_ATTR_UDP_ZERO_CSUM6_TX,    /* u8 */
+       L2TP_ATTR_UDP_ZERO_CSUM6_RX,    /* u8 */
        __L2TP_ATTR_MAX,
 };
 

diff --git a/include/linux/neighbour.h b/include/linux/neighbour.h
index d3ef583104e0c905503a3911c33ca4018294e7de..4a1d7e96dfe3d7ccf8669428a943ed53af37828e 100644 (file)
--- a/include/linux/neighbour.h
+++ b/include/linux/neighbour.h
@@ -24,6 +24,7 @@ enum {
        NDA_PORT,
        NDA_VNI,
        NDA_IFINDEX,
+       NDA_MASTER,
        __NDA_MAX
 };