From 3f34574d0f97a9fb62d421478f72140ad8380b53 Mon Sep 17 00:00:00 2001 From: Stephen Hemminger Date: Thu, 23 Feb 2017 08:58:11 -0800 Subject: [PATCH] Update headers based on 4.11 merge window Signed-off-by: Stephen Hemminger --- include/linux/netconf.h | 1 + include/linux/rtnetlink.h | 2 ++ 2 files changed, 3 insertions(+) diff --git a/include/linux/netconf.h b/include/linux/netconf.h index 70306a89a..4afbd7dbd 100644 --- a/include/linux/netconf.h +++ b/include/linux/netconf.h @@ -16,6 +16,7 @@ enum { NETCONFA_MC_FORWARDING, NETCONFA_PROXY_NEIGH, NETCONFA_IGNORE_ROUTES_WITH_LINKDOWN, + NETCONFA_INPUT, __NETCONFA_MAX }; #define NETCONFA_MAX (__NETCONFA_MAX - 1) diff --git a/include/linux/rtnetlink.h b/include/linux/rtnetlink.h index 998ac8ee2..d42fe83ce 100644 --- a/include/linux/rtnetlink.h +++ b/include/linux/rtnetlink.h @@ -656,6 +656,8 @@ enum rtnetlink_groups { #define RTNLGRP_MPLS_ROUTE RTNLGRP_MPLS_ROUTE RTNLGRP_NSID, #define RTNLGRP_NSID RTNLGRP_NSID + RTNLGRP_MPLS_NETCONF, +#define RTNLGRP_MPLS_NETCONF RTNLGRP_MPLS_NETCONF __RTNLGRP_MAX }; #define RTNLGRP_MAX (__RTNLGRP_MAX - 1) -- 2.47.2