ctstat does not apply to 2.4

PATCH New Phil Oester 1 participant 1 message Oct 1, 2004 netfilter

Share & tools

Phil Oester

author

2004-10-01 21:55 UTC #0 lore raw

PATCH 1/1 ctstat does not apply to 2.4

Current ctstat in pom-ng depends on three patches which are 2.6 only, but is not itself flagged 2.6 only. This breaks --batch mode on 2.4. The below patch removes the 2.4 version and adds the proper 'requires' entry.

Phil

ctstat/info +1 -0

diff -ruN pom-orig/ctstat/info pom-new/ctstat/info
@@ -1,4 +1,5 @@
 Author: Martin Josefsson <[email protected]>
 Status: Works when the planets align into the shape of tux, and only then
 Repository: pending
+Requires: linux >= 2.6.0
 Depends: conntrack-seqfile, expect-slab-cache, module_parm

ctstat/linux-2.4/include/linux/netfilter_ipv4/ip_conntrack.h.ladd +0 ~~-21~~

diff -ruN pom-orig/ctstat/linux-2.4/include/linux/netfilter_ipv4/ip_conntrack.h.ladd pom-new/ctstat/linux-2.4/include/linux/netfilter_ipv4/ip_conntrack.h.ladd
@@ -1,21 +0,0 @@
-extern unsigned int ip_conntrack_htable_size;
-
-struct ip_conntrack_stat
-{
-	unsigned int searched;
-	unsigned int found;
-	unsigned int new;
-	unsigned int invalid;
-	unsigned int ignore;
-	unsigned int delete;
-	unsigned int delete_list;
-	unsigned int insert;
-	unsigned int insert_failed;
-	unsigned int drop;
-	unsigned int early_drop;
-	unsigned int icmp_error;
-	unsigned int expect_new;
-	unsigned int expect_create;
-	unsigned int expect_delete;
-} ____cacheline_aligned_in_smp;
-

ctstat/linux-2.4.patch +0 ~~-261~~

261 lines not on this page · raw message