Update kernel headers

Update kernel headers to commit:
  92c932b9946c ("Merge branch 'mptcp-pm-userspace-misc-cleanups'")

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 be6cd764adf7447045f9cdd542a59f7681299409..a86060602c784c7500eef4acfcc92a752d669839 100644 (file)
--- a/include/uapi/linux/if_link.h
+++ b/include/uapi/linux/if_link.h
@@ -1392,6 +1392,7 @@ enum {
        IFLA_VXLAN_VNIFILTER, /* only applicable with COLLECT_METADATA mode */
        IFLA_VXLAN_LOCALBYPASS,
        IFLA_VXLAN_LABEL_POLICY, /* IPv6 flow label policy; ifla_vxlan_label_policy */
+       IFLA_VXLAN_RESERVED_BITS,
        __IFLA_VXLAN_MAX
 };
 #define IFLA_VXLAN_MAX (__IFLA_VXLAN_MAX - 1)

diff --git a/include/uapi/linux/rtnetlink.h b/include/uapi/linux/rtnetlink.h
index 1cb71e76208fcfe3a3a90a57c6f3a5af08a95e69..458e5670ce67bd729d9aa6d3673e1b18549a9e8c 100644 (file)
--- a/include/uapi/linux/rtnetlink.h
+++ b/include/uapi/linux/rtnetlink.h
@@ -93,7 +93,11 @@ enum {
        RTM_NEWPREFIX   = 52,
 #define RTM_NEWPREFIX  RTM_NEWPREFIX
 
-       RTM_GETMULTICAST = 58,
+       RTM_NEWMULTICAST = 56,
+#define RTM_NEWMULTICAST RTM_NEWMULTICAST
+       RTM_DELMULTICAST,
+#define RTM_DELMULTICAST RTM_DELMULTICAST
+       RTM_GETMULTICAST,
 #define RTM_GETMULTICAST RTM_GETMULTICAST
 
        RTM_GETANYCAST  = 62,
@@ -772,6 +776,10 @@ enum rtnetlink_groups {
 #define RTNLGRP_TUNNEL         RTNLGRP_TUNNEL
        RTNLGRP_STATS,
 #define RTNLGRP_STATS          RTNLGRP_STATS
+       RTNLGRP_IPV4_MCADDR,
+#define RTNLGRP_IPV4_MCADDR    RTNLGRP_IPV4_MCADDR
+       RTNLGRP_IPV6_MCADDR,
+#define RTNLGRP_IPV6_MCADDR    RTNLGRP_IPV6_MCADDR
        __RTNLGRP_MAX
 };
 #define RTNLGRP_MAX    (__RTNLGRP_MAX - 1)