diff options
| author | Thomas Haller <thaller@redhat.com> | 2014-03-20 18:18:45 (GMT) |
|---|---|---|
| committer | Thomas Haller <thaller@redhat.com> | 2014-03-21 11:38:45 (GMT) |
| commit | 1048a610fb03dd994285f55427f207fdcaf2b725 (patch) | |
| tree | fe0c50f406c1c8808f4d51a83f2028d27a78550c | |
| parent | 5981a39583ab65dca230a8ee70625626d9ec9fc8 (diff) | |
| download | libnl-1048a610fb03dd994285f55427f207fdcaf2b725.zip libnl-1048a610fb03dd994285f55427f207fdcaf2b725.tar.gz libnl-1048a610fb03dd994285f55427f207fdcaf2b725.tar.bz2 | |
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 <tgraf@suug.ch>
Signed-off-by: Thomas Haller <thaller@redhat.com>
| -rw-r--r-- | include/Makefile.am | 2 | ||||
| -rw-r--r-- | include/linux/ip.h (renamed from include/linux/inetdevice.h) | 0 | ||||
| -rw-r--r-- | include/netlink-private/netlink.h | 2 |
3 files changed, 2 insertions, 2 deletions
diff --git a/include/Makefile.am b/include/Makefile.am index 32f872f..1b13f5a 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 index fd4d2df..fd4d2df 100644 --- a/include/linux/inetdevice.h +++ b/include/linux/ip.h diff --git a/include/netlink-private/netlink.h b/include/netlink-private/netlink.h index 2b1a68e..ee2a8b1 100644 --- a/include/netlink-private/netlink.h +++ b/include/netlink-private/netlink.h @@ -51,7 +51,7 @@ #include <linux/gen_stats.h> #include <linux/ip_mp_alg.h> #include <linux/atm.h> -#include <linux/inetdevice.h> +#include <linux/ip.h> #include <linux/ipv6.h> #include <linux/snmp.h> |