patch to compile for 2.6

SVN-Revision: 2001
This commit is contained in:
Waldemar Brodkorb 2005-09-29 11:13:27 +00:00
parent 945d8f383c
commit 2880bd87aa

View file

@ -0,0 +1,66 @@
diff -Nur ipset-2.2.3.orig/ipset.c ipset-2.2.3/ipset.c
--- ipset-2.2.3.orig/ipset.c 2005-04-05 09:56:02.000000000 +0200
+++ ipset-2.2.3/ipset.c 2005-09-29 13:07:07.446923250 +0200
@@ -21,7 +21,6 @@
#include <stdarg.h>
#include <netdb.h>
#include <dlfcn.h>
-#include <asm/bitops.h>
#include "ipset.h"
diff -Nur ipset-2.2.3.orig/ipset_iphash.c ipset-2.2.3/ipset_iphash.c
--- ipset-2.2.3.orig/ipset_iphash.c 2005-01-19 14:38:57.000000000 +0100
+++ ipset-2.2.3/ipset_iphash.c 2005-09-29 13:07:26.308102000 +0200
@@ -25,7 +25,6 @@
#include <sys/types.h>
#include <netinet/in.h>
#include <arpa/inet.h>
-#include <asm/bitops.h>
#include <asm/types.h>
#include <linux/netfilter_ipv4/ip_set_iphash.h>
diff -Nur ipset-2.2.3.orig/ipset_ipmap.c ipset-2.2.3/ipset_ipmap.c
--- ipset-2.2.3.orig/ipset_ipmap.c 2005-01-19 14:38:57.000000000 +0100
+++ ipset-2.2.3/ipset_ipmap.c 2005-09-29 13:07:07.446923250 +0200
@@ -22,7 +22,6 @@
#include <sys/socket.h>
#include <netinet/in.h>
#include <arpa/inet.h>
-#include <asm/bitops.h>
#include <linux/netfilter_ipv4/ip_set_ipmap.h>
#include "ipset.h"
diff -Nur ipset-2.2.3.orig/ipset_macipmap.c ipset-2.2.3/ipset_macipmap.c
--- ipset-2.2.3.orig/ipset_macipmap.c 2005-01-19 14:38:57.000000000 +0100
+++ ipset-2.2.3/ipset_macipmap.c 2005-09-29 13:07:07.446923250 +0200
@@ -24,7 +24,6 @@
#include <sys/socket.h>
#include <netinet/in.h>
#include <arpa/inet.h>
-#include <asm/bitops.h>
#include <linux/if_ether.h>
#include <linux/netfilter_ipv4/ip_set_macipmap.h>
diff -Nur ipset-2.2.3.orig/ipset_nethash.c ipset-2.2.3/ipset_nethash.c
--- ipset-2.2.3.orig/ipset_nethash.c 2005-05-09 07:44:25.000000000 +0200
+++ ipset-2.2.3/ipset_nethash.c 2005-09-29 13:07:07.446923250 +0200
@@ -25,7 +25,6 @@
#include <sys/types.h>
#include <netinet/in.h>
#include <arpa/inet.h>
-#include <asm/bitops.h>
#include <asm/types.h>
#include <linux/netfilter_ipv4/ip_set_nethash.h>
diff -Nur ipset-2.2.3.orig/ipset_portmap.c ipset-2.2.3/ipset_portmap.c
--- ipset-2.2.3.orig/ipset_portmap.c 2005-01-19 14:38:57.000000000 +0100
+++ ipset-2.2.3/ipset_portmap.c 2005-09-29 13:07:07.446923250 +0200
@@ -21,7 +21,6 @@
#include <sys/socket.h>
#include <netinet/in.h>
#include <arpa/inet.h>
-#include <asm/bitops.h>
#include <linux/netfilter_ipv4/ip_set_portmap.h>
#include "ipset.h"