[NETFILTER]: Remove IPv4 only connection tracking/NAT

Remove the obsolete IPv4 only connection tracking/NAT as scheduled in
feature-removal-schedule.

Signed-off-by: Patrick McHardy <kaber@trash.net>
Signed-off-by: David S. Miller <davem@davemloft.net>

1 files changed, 7 insertions, 3 deletions

diff --git a/net/netfilter/xt_connbytes.c b/net/netfilter/xt_connbytes.c
index 302043bc41b..fec9316a1e1 100644
--- a/net/netfilter/xt_connbytes.c
+++ b/net/netfilter/xt_connbytes.c
@@ -12,9 +12,9 @@
  */
 #include <linux/module.h>
 #include <linux/skbuff.h>
-#include <net/netfilter/nf_conntrack_compat.h>
 #include <linux/netfilter/x_tables.h>
 #include <linux/netfilter/xt_connbytes.h>
+#include <net/netfilter/nf_conntrack.h>
 
 #include <asm/div64.h>
 #include <asm/bitops.h>
@@ -35,13 +35,17 @@ match(const struct sk_buff *skb,
       int *hotdrop)
 {
         const struct xt_connbytes_info *sinfo = matchinfo;
+        struct nf_conn *ct;
+        enum ip_conntrack_info ctinfo;
         u_int64_t what = 0;     /* initialize to make gcc happy */
         u_int64_t bytes = 0;
         u_int64_t pkts = 0;
         const struct ip_conntrack_counter *counters;
 
-        if (!(counters = nf_ct_get_counters(skb)))
-                return 0; /* no match */
+        ct = nf_ct_get(skb, &ctinfo);
+        if (!ct)
+                return 0;
+        counters = ct->counters;
 
         switch (sinfo->what) {
         case XT_CONNBYTES_PKTS: