netfilter: xtables: give xt_ecn its own name

Use the new macro and struct names in xt_ecn.h, and put the old
definitions into a definition-forwarding ipt_ecn.h.

Signed-off-by: Jan Engelhardt <jengelh@medozas.de>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>

2 files changed, 16 insertions, 7 deletions

diff --git a/include/linux/netfilter/xt_ecn.h b/include/linux/netfilter/xt_ecn.h
index 065c1a537e5d..7158fca364f2 100644
--- a/include/linux/netfilter/xt_ecn.h
+++ b/include/linux/netfilter/xt_ecn.h
@@ -12,16 +12,16 @@
 #include <linux/types.h>
 #include <linux/netfilter/xt_dscp.h>
 
-#define IPT_ECN_IP_MASK (~XT_DSCP_MASK)
+#define XT_ECN_IP_MASK  (~XT_DSCP_MASK)
 
-#define IPT_ECN_OP_MATCH_IP     0x01
-#define IPT_ECN_OP_MATCH_ECE    0x10
-#define IPT_ECN_OP_MATCH_CWR    0x20
+#define XT_ECN_OP_MATCH_IP      0x01
+#define XT_ECN_OP_MATCH_ECE     0x10
+#define XT_ECN_OP_MATCH_CWR     0x20
 
-#define IPT_ECN_OP_MATCH_MASK   0xce
+#define XT_ECN_OP_MATCH_MASK    0xce
 
 /* match info */
-struct ipt_ecn_info {
+struct xt_ecn_info {
         __u8 operation;
         __u8 invert;
         __u8 ip_ect;
diff --git a/include/linux/netfilter_ipv4/ipt_ecn.h b/include/linux/netfilter_ipv4/ipt_ecn.h
index b1124ec76190..0e0c063dbf60 100644
--- a/include/linux/netfilter_ipv4/ipt_ecn.h
+++ b/include/linux/netfilter_ipv4/ipt_ecn.h
@@ -2,5 +2,14 @@
 #define _IPT_ECN_H
 
 #include <linux/netfilter/xt_ecn.h>
+#define ipt_ecn_info xt_ecn_info
 
-#endif /* _IPT_ECN_H */
+enum {
+        IPT_ECN_IP_MASK       = XT_ECN_IP_MASK,
+        IPT_ECN_OP_MATCH_IP   = XT_ECN_OP_MATCH_IP,
+        IPT_ECN_OP_MATCH_ECE  = XT_ECN_OP_MATCH_ECE,
+        IPT_ECN_OP_MATCH_CWR  = XT_ECN_OP_MATCH_CWR,
+        IPT_ECN_OP_MATCH_MASK = XT_ECN_OP_MATCH_MASK,
+};
+
+#endif /* IPT_ECN_H */