Revert "[BACKPORT] build: move copy of linux headers to private directory" am: 0a450fbeca am: 12d512d9f2 am: 067e13b78c am: 3202d7772d

Change-Id: Id7310e8ae276c6759a7656a0da18c5bbf7395d5e

35 files changed, 3 insertions, 26 deletions

diff --git a/include/linux-private/linux/ip_mp_alg.h b/include/linux-private/linux/ip_mp_alg.h
deleted file mode 100644
index e234e200..00000000
--- a/include/linux-private/linux/ip_mp_alg.h
+++ /dev/null
@@ -1,22 +0,0 @@
-/* ip_mp_alg.h: IPV4 multipath algorithm support, user-visible values.
- *
- * Copyright (C) 2004, 2005 Einar Lueck <elueck@de.ibm.com>
- * Copyright (C) 2005 David S. Miller <davem@davemloft.net>
- */
-
-#ifndef _LINUX_IP_MP_ALG_H
-#define _LINUX_IP_MP_ALG_H
-
-enum ip_mp_alg {
-	IP_MP_ALG_NONE,
-	IP_MP_ALG_RR,
-	IP_MP_ALG_DRR,
-	IP_MP_ALG_RANDOM,
-	IP_MP_ALG_WRANDOM,
-	__IP_MP_ALG_MAX
-};
-
-#define IP_MP_ALG_MAX (__IP_MP_ALG_MAX - 1)
-
-#endif /* _LINUX_IP_MP_ALG_H */
-
diff --git a/include/linux-private/linux/can/netlink.h b/include/linux/can/netlink.h
index 14966ddb..14966ddb 100644
--- a/include/linux-private/linux/can/netlink.h
+++ b/include/linux/can/netlink.h
diff --git a/include/linux-private/linux/fib_rules.h b/include/linux/fib_rules.h
index ed4504a8..ed4504a8 100644
--- a/include/linux-private/linux/fib_rules.h
+++ b/include/linux/fib_rules.h
diff --git a/include/linux-private/linux/gen_stats.h b/include/linux/gen_stats.h
index 552c8a0a..552c8a0a 100644
--- a/include/linux-private/linux/gen_stats.h
+++ b/include/linux/gen_stats.h
diff --git a/include/linux-private/linux/genetlink.h b/include/linux/genetlink.h
index b834ef6d..b834ef6d 100644
--- a/include/linux-private/linux/genetlink.h
+++ b/include/linux/genetlink.h
diff --git a/include/linux-private/linux/if_addr.h b/include/linux/if_addr.h
index 7d4de855..7d4de855 100644
--- a/include/linux-private/linux/if_addr.h
+++ b/include/linux/if_addr.h
diff --git a/include/linux-private/linux/if_arp.h b/include/linux/if_arp.h
index e04cd2cd..e04cd2cd 100644
--- a/include/linux-private/linux/if_arp.h
+++ b/include/linux/if_arp.h
diff --git a/include/linux-private/linux/if_bad.h b/include/linux/if_bad.h
index bbb3ea37..bbb3ea37 100644
--- a/include/linux-private/linux/if_bad.h
+++ b/include/linux/if_bad.h
diff --git a/include/linux-private/linux/if_bridge.h b/include/linux/if_bridge.h
index 5db29751..5db29751 100644
--- a/include/linux-private/linux/if_bridge.h
+++ b/include/linux/if_bridge.h
diff --git a/include/linux-private/linux/if_ether.h b/include/linux/if_ether.h
index a6af32d7..a6af32d7 100644
--- a/include/linux-private/linux/if_ether.h
+++ b/include/linux/if_ether.h
diff --git a/include/linux-private/linux/if_link.h b/include/linux/if_link.h
index 8b849394..8b849394 100644
--- a/include/linux-private/linux/if_link.h
+++ b/include/linux/if_link.h
diff --git a/include/linux-private/linux/if_tunnel.h b/include/linux/if_tunnel.h
index aee73d06..aee73d06 100644
--- a/include/linux-private/linux/if_tunnel.h
+++ b/include/linux/if_tunnel.h
diff --git a/include/linux-private/linux/if_vlan.h b/include/linux/if_vlan.h
index 67affd16..67affd16 100644
--- a/include/linux-private/linux/if_vlan.h
+++ b/include/linux/if_vlan.h
diff --git a/include/linux-private/linux/ip.h b/include/linux/ip.h
index 41195940..41195940 100644
--- a/include/linux-private/linux/ip.h
+++ b/include/linux/ip.h
diff --git a/include/linux-private/linux/ipv6.h b/include/linux/ipv6.h
index f16349df..f16349df 100644
--- a/include/linux-private/linux/ipv6.h
+++ b/include/linux/ipv6.h
diff --git a/include/linux-private/linux/neighbour.h b/include/linux/neighbour.h
index a7003b7a..a7003b7a 100644
--- a/include/linux-private/linux/neighbour.h
+++ b/include/linux/neighbour.h
diff --git a/include/linux-private/linux/netfilter.h b/include/linux/netfilter.h
index 79998855..79998855 100644
--- a/include/linux-private/linux/netfilter.h
+++ b/include/linux/netfilter.h
diff --git a/include/linux-private/linux/netfilter/nf_conntrack_common.h b/include/linux/netfilter/nf_conntrack_common.h
index 1644cdd8..1644cdd8 100644
--- a/include/linux-private/linux/netfilter/nf_conntrack_common.h
+++ b/include/linux/netfilter/nf_conntrack_common.h
diff --git a/include/linux-private/linux/netfilter/nfnetlink.h b/include/linux/netfilter/nfnetlink.h
index 1fe29727..1fe29727 100644
--- a/include/linux-private/linux/netfilter/nfnetlink.h
+++ b/include/linux/netfilter/nfnetlink.h
diff --git a/include/linux-private/linux/netfilter/nfnetlink_acct.h b/include/linux/netfilter/nfnetlink_acct.h
index 4858e5d5..4858e5d5 100644
--- a/include/linux-private/linux/netfilter/nfnetlink_acct.h
+++ b/include/linux/netfilter/nfnetlink_acct.h
diff --git a/include/linux-private/linux/netfilter/nfnetlink_compat.h b/include/linux/netfilter/nfnetlink_compat.h
index ffb95036..ffb95036 100644
--- a/include/linux-private/linux/netfilter/nfnetlink_compat.h
+++ b/include/linux/netfilter/nfnetlink_compat.h
diff --git a/include/linux-private/linux/netfilter/nfnetlink_conntrack.h b/include/linux/netfilter/nfnetlink_conntrack.h
index 43bfe3e1..43bfe3e1 100644
--- a/include/linux-private/linux/netfilter/nfnetlink_conntrack.h
+++ b/include/linux/netfilter/nfnetlink_conntrack.h
diff --git a/include/linux-private/linux/netfilter/nfnetlink_log.h b/include/linux/netfilter/nfnetlink_log.h
index 2cfbf139..2cfbf139 100644
--- a/include/linux-private/linux/netfilter/nfnetlink_log.h
+++ b/include/linux/netfilter/nfnetlink_log.h
diff --git a/include/linux-private/linux/netfilter/nfnetlink_queue.h b/include/linux/netfilter/nfnetlink_queue.h
index 95af967d..95af967d 100644
--- a/include/linux-private/linux/netfilter/nfnetlink_queue.h
+++ b/include/linux/netfilter/nfnetlink_queue.h
diff --git a/include/linux-private/linux/netlink.h b/include/linux/netlink.h
index 39252548..39252548 100644
--- a/include/linux-private/linux/netlink.h
+++ b/include/linux/netlink.h
diff --git a/include/linux-private/linux/pkt_cls.h b/include/linux/pkt_cls.h
index defbde20..defbde20 100644
--- a/include/linux-private/linux/pkt_cls.h
+++ b/include/linux/pkt_cls.h
diff --git a/include/linux-private/linux/pkt_sched.h b/include/linux/pkt_sched.h
index a0837a0b..a0837a0b 100644
--- a/include/linux-private/linux/pkt_sched.h
+++ b/include/linux/pkt_sched.h
diff --git a/include/linux-private/linux/rtnetlink.h b/include/linux/rtnetlink.h
index 2363c18e..2363c18e 100644
--- a/include/linux-private/linux/rtnetlink.h
+++ b/include/linux/rtnetlink.h
diff --git a/include/linux-private/linux/snmp.h b/include/linux/snmp.h
index 1bdb4a39..1bdb4a39 100644
--- a/include/linux-private/linux/snmp.h
+++ b/include/linux/snmp.h
diff --git a/include/linux-private/linux/tc_act/tc_mirred.h b/include/linux/tc_act/tc_mirred.h
index 7561750e..7561750e 100644
--- a/include/linux-private/linux/tc_act/tc_mirred.h
+++ b/include/linux/tc_act/tc_mirred.h
diff --git a/include/linux-private/linux/tc_ematch/tc_em_meta.h b/include/linux/tc_ematch/tc_em_meta.h
index fe815e26..fe815e26 100644
--- a/include/linux-private/linux/tc_ematch/tc_em_meta.h
+++ b/include/linux/tc_ematch/tc_em_meta.h
diff --git a/lib/Makefile.am b/lib/Makefile.am
index bc8944d3..1ae37a93 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -2,7 +2,6 @@
 
 AM_CPPFLAGS  =			 	\
 	-Wall \
-	-I${top_srcdir}/include/linux-private \
 	-I${top_srcdir}/include \
 	-I${top_builddir}/include \
 	-I${builddir}/route \
diff --git a/src/Makefile.am b/src/Makefile.am
index b40b8a06..f8ac4ca0 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -2,7 +2,7 @@
 
 SUBDIRS = lib
 
-AM_CPPFLAGS  = -I${top_srcdir}/include/linux-private -I${top_srcdir}/include -I${top_builddir}/include -D_GNU_SOURCE -DSYSCONFDIR=\"$(sysconfdir)/libnl\"
+AM_CPPFLAGS  = -I${top_srcdir}/include -I${top_builddir}/include -D_GNU_SOURCE -DSYSCONFDIR=\"$(sysconfdir)/libnl\"
 AM_CFLAGS = -Wall
 
 LDADD = \
diff --git a/src/lib/Makefile.am b/src/lib/Makefile.am
index 2c259be6..51611151 100644
--- a/src/lib/Makefile.am
+++ b/src/lib/Makefile.am
@@ -1,6 +1,6 @@
 # -*- Makefile -*-
 
-AM_CPPFLAGS  = -I${top_srcdir}/include/linux-private -I${top_srcdir}/include -I${top_builddir}/include -D_GNU_SOURCE -DPKGLIBDIR=\"$(pkglibdir)\" -DSYSCONFDIR=\"$(sysconfdir)\" -rdynamic
+AM_CPPFLAGS  = -I${top_srcdir}/include -I${top_builddir}/include -D_GNU_SOURCE -DPKGLIBDIR=\"$(pkglibdir)\" -DSYSCONFDIR=\"$(sysconfdir)\" -rdynamic
 AM_CFLAGS = -Wall
 AM_LDFLAGS = \
 	-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
diff --git a/tests/Makefile.am b/tests/Makefile.am
index c388d0b5..255033d7 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -5,7 +5,7 @@ EXTRA_DIST = \
 
 if ENABLE_UNIT_TESTS
 
-AM_CPPFLAGS  = -Wall -I${top_srcdir}/include/linux-private -I${top_srcdir}/include -I${top_builddir}/include -D_GNU_SOURCE -DSYSCONFDIR=\"$(sysconfdir)/libnl\"
+AM_CPPFLAGS  = -Wall -I${top_srcdir}/include -I${top_builddir}/include -D_GNU_SOURCE -DSYSCONFDIR=\"$(sysconfdir)/libnl\"
 
 LDADD = \
 	${top_builddir}/lib/libnl-3.la \