fix linux/pkt_act.h inclusion

We should copy and use the kernel header linux/tc_act/tc_mirred.h.

Signed-off-by: Cong Wang <xiyou.wangcong@gmail.com>
Signed-off-by: Thomas Graf <tgraf@suug.ch>

diff --git a/include/Makefile.am b/include/Makefile.am
index c6d332465380995481d1794664e8b2ff4585711e..8cf517952ee0ec9a32f8c7ebdff6562055fd5c36 100644 (file)
--- a/include/Makefile.am
+++ b/include/Makefile.am
@@ -130,6 +130,7 @@ noinst_HEADERS = \
        linux/netfilter/nfnetlink_queue.h \
        linux/netlink.h \
        linux/pkt_cls.h \
+       linux/tc_act/tc_mirred.h \
        linux/pkt_sched.h \
        linux/rtnetlink.h \
        linux/snmp.h \

diff --git a/include/linux/pkt_act.h b/include/linux/tc_act/tc_mirred.h
similarity index 67%
rename from include/linux/pkt_act.h
rename to include/linux/tc_act/tc_mirred.h
index ba8c860dadfd0436018e9a4da16ca0934634302a..7561750e8fd69b92e1e1a4929e25ec8709d74ce2 100644 (file)
--- a/include/linux/pkt_act.h
+++ b/include/linux/tc_act/tc_mirred.h
@@ -1,5 +1,5 @@
-#ifndef __LINUX_PKT_ACT_H
-#define __LINUX_PKT_ACT_H
+#ifndef __LINUX_TC_MIR_H
+#define __LINUX_TC_MIR_H
 
 #include <linux/types.h>
 #include <linux/pkt_cls.h>
@@ -9,13 +9,13 @@
 #define TCA_EGRESS_MIRROR 2 /* mirror packet to EGRESS */
 #define TCA_INGRESS_REDIR 3  /* packet redirect to INGRESS*/
 #define TCA_INGRESS_MIRROR 4 /* mirror packet to INGRESS */
-
+                                                                                
 struct tc_mirred {
        tc_gen;
        int                     eaction;   /* one of IN/EGRESS_MIRROR/REDIR */
        __u32                   ifindex;  /* ifindex of egress port */
 };
-
+                                                                                
 enum {
        TCA_MIRRED_UNSPEC,
        TCA_MIRRED_TM,
@@ -23,10 +23,5 @@ enum {
        __TCA_MIRRED_MAX
 };
 #define TCA_MIRRED_MAX (__TCA_MIRRED_MAX - 1)
-
-struct rtnl_mirred
-{
-       struct tc_mirred m_parm;
-};
-
+                                                                                
 #endif

diff --git a/include/netlink-private/types.h b/include/netlink-private/types.h
index 99fea27fc145f0b2c75cbc7aec13a36ad32ae24c..4d997cdb9e01033325dd71256b8a4c308dfaffe9 100644 (file)
--- a/include/netlink-private/types.h
+++ b/include/netlink-private/types.h
@@ -21,6 +21,7 @@
 #include <netlink/idiag/idiagnl.h>
 #include <netlink/netfilter/ct.h>
 #include <netlink-private/route/tc-api.h>
+#include <linux/tc_act/tc_mirred.h>
 
 #define NL_SOCK_BUFSIZE_SET    (1<<0)
 #define NL_SOCK_PASSCRED       (1<<1)
@@ -514,6 +515,11 @@ struct rtnl_act
        struct rtnl_act *       a_next;
 };
 
+struct rtnl_mirred
+{
+       struct tc_mirred m_parm;
+};
+
 struct rtnl_u32
 {
        uint32_t                cu_divisor;

diff --git a/include/netlink/route/act/mirred.h b/include/netlink/route/act/mirred.h
index 20a777ca6d0b101ca8707753fb9dfdb2725b6b34..0f9adf1637a12feabcc7c16a92e57ccf1e120db8 100644 (file)
--- a/include/netlink/route/act/mirred.h
+++ b/include/netlink/route/act/mirred.h
@@ -15,6 +15,7 @@
 #include <netlink/netlink.h>
 #include <netlink/cache.h>
 #include <netlink/route/action.h>
+#include <linux/tc_act/tc_mirred.h>
 
 #ifdef __cplusplus
 extern "C" {

diff --git a/include/netlink/route/action.h b/include/netlink/route/action.h
index 8e265eab51045775db8f9098970c2aad75ea9962..be527675c0e2d4edf52ab90f60ea483db009ffd4 100644 (file)
--- a/include/netlink/route/action.h
+++ b/include/netlink/route/action.h
@@ -16,7 +16,6 @@
 #include <netlink/cache.h>
 #include <netlink/route/tc.h>
 #include <netlink/utils.h>
-#include <linux/pkt_act.h>
 
 #ifdef __cplusplus
 extern "C" {