update kernel headers to 4.2-net-next

diff --git a/include/linux/if_link.h b/include/linux/if_link.h
index 8f105cf20bb9e059c70f8b9c4fa0a43ca47c6940..193456660ee84b78c7be4940ec4a490948321da5 100644 (file)
--- a/include/linux/if_link.h
+++ b/include/linux/if_link.h
@@ -229,6 +229,7 @@ enum {
        IFLA_BR_STP_STATE,
        IFLA_BR_PRIORITY,
        IFLA_BR_VLAN_FILTERING,
+       IFLA_BR_VLAN_PROTOCOL,
        __IFLA_BR_MAX,
 };
 
@@ -407,6 +408,8 @@ enum {
        IFLA_GENEVE_REMOTE,
        IFLA_GENEVE_TTL,
        IFLA_GENEVE_TOS,
+       IFLA_GENEVE_PORT,       /* destination port */
+       IFLA_GENEVE_COLLECT_METADATA,
        __IFLA_GENEVE_MAX
 };
 #define IFLA_GENEVE_MAX        (__IFLA_GENEVE_MAX - 1)

diff --git a/include/linux/netlink.h b/include/linux/netlink.h
index d87cdf147bcf6611bd8766278d8acd4d278c6634..352b5b8882640a4a4c41e7db1f088bb9bada4a1e 100644 (file)
--- a/include/linux/netlink.h
+++ b/include/linux/netlink.h
@@ -110,6 +110,7 @@ struct nlmsgerr {
 #define NETLINK_TX_RING                        7
 #define NETLINK_LISTEN_ALL_NSID                8
 #define NETLINK_LIST_MEMBERSHIPS       9
+#define NETLINK_CAP_ACK                        10
 
 struct nl_pktinfo {
        __u32   group;

diff --git a/include/linux/rtnetlink.h b/include/linux/rtnetlink.h
index 328c1b0f75c3807a76b3c8c120fa585453d27eae..3fe10b054d1fbe576282c3e89446fc81b275ce55 100644 (file)
--- a/include/linux/rtnetlink.h
+++ b/include/linux/rtnetlink.h
@@ -418,10 +418,13 @@ enum {
 
 #define RTAX_MAX (__RTAX_MAX - 1)
 
-#define RTAX_FEATURE_ECN       0x00000001
-#define RTAX_FEATURE_SACK      0x00000002
-#define RTAX_FEATURE_TIMESTAMP 0x00000004
-#define RTAX_FEATURE_ALLFRAG   0x00000008
+#define RTAX_FEATURE_ECN       (1 << 0)
+#define RTAX_FEATURE_SACK      (1 << 1)
+#define RTAX_FEATURE_TIMESTAMP (1 << 2)
+#define RTAX_FEATURE_ALLFRAG   (1 << 3)
+
+#define RTAX_FEATURE_MASK      (RTAX_FEATURE_ECN | RTAX_FEATURE_SACK | \
+                                RTAX_FEATURE_TIMESTAMP | RTAX_FEATURE_ALLFRAG)
 
 struct rta_session {
        __u8    proto;