From 1048a610fb03dd994285f55427f207fdcaf2b725 Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Thu, 20 Mar 2014 19:18:45 +0100 Subject: [PATCH] route: rename internal copy of kernel header file 'inetdevice.h' to 'ip.h' libnl used 'inetdevice.h' for the IPV4_DEVCONF_* names, which the kernel in the meantime moved to public user space API and are now defined in 'ip.h'. As a first step, rename the file 'inetdevice.h'. Acked-by: Thomas Graf Signed-off-by: Thomas Haller --- include/Makefile.am | 2 +- include/linux/{inetdevice.h => ip.h} | 0 include/netlink-private/netlink.h | 2 +- 3 files changed, 2 insertions(+), 2 deletions(-) rename include/linux/{inetdevice.h => ip.h} (100%) diff --git a/include/Makefile.am b/include/Makefile.am index 32f872f99..1b13f5a87 100644 --- a/include/Makefile.am +++ b/include/Makefile.am @@ -117,7 +117,7 @@ noinst_HEADERS = \ linux/if_bridge.h \ linux/if_link.h \ linux/if_vlan.h \ - linux/inetdevice.h \ + linux/ip.h \ linux/ip_mp_alg.h \ linux/ipv6.h \ linux/can/netlink.h \ diff --git a/include/linux/inetdevice.h b/include/linux/ip.h similarity index 100% rename from include/linux/inetdevice.h rename to include/linux/ip.h diff --git a/include/netlink-private/netlink.h b/include/netlink-private/netlink.h index 2b1a68e44..ee2a8b10a 100644 --- a/include/netlink-private/netlink.h +++ b/include/netlink-private/netlink.h @@ -51,7 +51,7 @@ #include #include #include -#include +#include #include #include