Update headers based on 4.11 merge window

Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>

diff --git a/include/linux/netconf.h b/include/linux/netconf.h
index 70306a89a8bbd2fcf64e393523b6230a695c9e3e..4afbd7dbd05de224840acecba090ab7a00c74212 100644 (file)
--- 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 998ac8ee20e7fec90627b86576bacfec87c82244..d42fe83cec694db28f54cc0529defd96e5a5be5b 100644 (file)
--- 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)