Update kernel headers

Update kernel headers to commit:
    14966a8df77e ("selftest: add selftest for anycast notifications")

Signed-off-by: David Ahern <dsahern@kernel.org>

diff --git a/include/uapi/linux/if_link.h b/include/uapi/linux/if_link.h
index bb94d881b49f97e91c96ac7c0e3ff5a94f112c7c..cdb5acc065cf9d505dcd2e4a057d155359c03619 100644 (file)
--- a/include/uapi/linux/if_link.h
+++ b/include/uapi/linux/if_link.h
@@ -1396,6 +1396,7 @@ enum {
        IFLA_VXLAN_LOCALBYPASS,
        IFLA_VXLAN_LABEL_POLICY, /* IPv6 flow label policy; ifla_vxlan_label_policy */
        IFLA_VXLAN_RESERVED_BITS,
+       IFLA_VXLAN_MC_ROUTE,
        __IFLA_VXLAN_MAX
 };
 #define IFLA_VXLAN_MAX (__IFLA_VXLAN_MAX - 1)

diff --git a/include/uapi/linux/in6.h b/include/uapi/linux/in6.h
index 776fb41c50e40294d7d6a5656fdb99a8b34bcd3e..671301569a7ec9ab4ee96f0338fe05b84609f92a 100644 (file)
--- a/include/uapi/linux/in6.h
+++ b/include/uapi/linux/in6.h
@@ -152,7 +152,6 @@ struct in6_flowlabel_req {
 /*
  *     IPV6 socket options
  */
-#if __UAPI_DEF_IPV6_OPTIONS
 #define IPV6_ADDRFORM          1
 #define IPV6_2292PKTINFO       2
 #define IPV6_2292HOPOPTS       3
@@ -169,8 +168,10 @@ struct in6_flowlabel_req {
 #define IPV6_MULTICAST_IF      17
 #define IPV6_MULTICAST_HOPS    18
 #define IPV6_MULTICAST_LOOP    19
+#if __UAPI_DEF_IPV6_OPTIONS
 #define IPV6_ADD_MEMBERSHIP    20
 #define IPV6_DROP_MEMBERSHIP   21
+#endif
 #define IPV6_ROUTER_ALERT      22
 #define IPV6_MTU_DISCOVER      23
 #define IPV6_MTU               24
@@ -203,7 +204,6 @@ struct in6_flowlabel_req {
 #define IPV6_IPSEC_POLICY      34
 #define IPV6_XFRM_POLICY       35
 #define IPV6_HDRINCL           36
-#endif
 
 /*
  * Multicast: