From 9a18a05d02dc4506afe7832c5894c13bef111a2f Mon Sep 17 00:00:00 2001
From: Jan Engelhardt <jengelh@medozas.de>
Date: Thu, 13 May 2010 19:45:52 +0200
Subject: [PATCH] compat_xtables: move to 2.6.35 xt_action_param (2/3)

---
 extensions/compat_xtnu.h      | 2 +-
 extensions/ipset/ipt_set.c    | 2 +-
 extensions/pknock/xt_pknock.c | 2 +-
 extensions/xt_DHCPMAC.c       | 2 +-
 extensions/xt_condition.c     | 2 +-
 extensions/xt_fuzzy.c         | 2 +-
 extensions/xt_geoip.c         | 2 +-
 extensions/xt_iface.c         | 2 +-
 extensions/xt_ipp2p.c         | 2 +-
 extensions/xt_ipv4options.c   | 2 +-
 extensions/xt_length2.c       | 4 ++--
 extensions/xt_lscan.c         | 2 +-
 extensions/xt_psd.c           | 2 +-
 extensions/xt_quota2.c        | 2 +-
 14 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/extensions/compat_xtnu.h b/extensions/compat_xtnu.h
index 5af3958..4ff8adb 100644
--- a/extensions/compat_xtnu.h
+++ b/extensions/compat_xtnu.h
@@ -95,7 +95,7 @@ struct xtnu_match {
 	 */
 	char name[sizeof(((struct xt_match *)NULL)->name) - 1 - sizeof(void *)];
 	uint8_t revision;
-	bool (*match)(const struct sk_buff *, const struct xt_action_param *);
+	bool (*match)(const struct sk_buff *, struct xt_action_param *);
 	int (*checkentry)(const struct xt_mtchk_param *);
 	void (*destroy)(const struct xt_mtdtor_param *);
 	struct module *me;
diff --git a/extensions/ipset/ipt_set.c b/extensions/ipset/ipt_set.c
index 30cc264..d620573 100644
--- a/extensions/ipset/ipt_set.c
+++ b/extensions/ipset/ipt_set.c
@@ -38,7 +38,7 @@ match_set(const struct ipt_set_info *info,
 }
 
 static bool
-match(const struct sk_buff *skb, const struct xt_action_param *par)
+match(const struct sk_buff *skb, struct xt_action_param *par)
 {
 	const struct ipt_set_info_match *info = par->matchinfo;
 		
diff --git a/extensions/pknock/xt_pknock.c b/extensions/pknock/xt_pknock.c
index 8ddbd5a..c62df39 100644
--- a/extensions/pknock/xt_pknock.c
+++ b/extensions/pknock/xt_pknock.c
@@ -958,7 +958,7 @@ is_close_knock(const struct peer *peer, const struct xt_pknock_mtinfo *info,
 }
 
 static bool pknock_mt(const struct sk_buff *skb,
-    const struct xt_action_param *par)
+    struct xt_action_param *par)
 {
 	const struct xt_pknock_mtinfo *info = par->matchinfo;
 	struct xt_pknock_rule *rule;
diff --git a/extensions/xt_DHCPMAC.c b/extensions/xt_DHCPMAC.c
index 42b9197..d59babf 100644
--- a/extensions/xt_DHCPMAC.c
+++ b/extensions/xt_DHCPMAC.c
@@ -69,7 +69,7 @@ static bool ether_cmp(const unsigned char *lh, const unsigned char *rh,
 }
 
 static bool
-dhcpmac_mt(const struct sk_buff *skb, const struct xt_action_param *par)
+dhcpmac_mt(const struct sk_buff *skb, struct xt_action_param *par)
 {
 	const struct dhcpmac_info *info = par->matchinfo;
 	const struct dhcp_message *dh;
diff --git a/extensions/xt_condition.c b/extensions/xt_condition.c
index c1f082d..24f43c9 100644
--- a/extensions/xt_condition.c
+++ b/extensions/xt_condition.c
@@ -96,7 +96,7 @@ static int condition_proc_write(struct file *file, const char __user *buffer,
 }
 
 static bool
-condition_mt(const struct sk_buff *skb, const struct xt_action_param *par)
+condition_mt(const struct sk_buff *skb, struct xt_action_param *par)
 {
 	const struct xt_condition_mtinfo *info = par->matchinfo;
 	const struct condition_variable *var   = info->condvar;
diff --git a/extensions/xt_fuzzy.c b/extensions/xt_fuzzy.c
index 4d066bf..b715751 100644
--- a/extensions/xt_fuzzy.c
+++ b/extensions/xt_fuzzy.c
@@ -60,7 +60,7 @@ static uint8_t mf_low(uint32_t tx, uint32_t mini, uint32_t maxi)
 }
 
 static bool
-fuzzy_mt(const struct sk_buff *skb, const struct xt_action_param *par)
+fuzzy_mt(const struct sk_buff *skb, struct xt_action_param *par)
 {
 	struct xt_fuzzy_mtinfo *info = (void *)par->matchinfo;
 	unsigned long amount;
diff --git a/extensions/xt_geoip.c b/extensions/xt_geoip.c
index 92d2915..4c6b29f 100644
--- a/extensions/xt_geoip.c
+++ b/extensions/xt_geoip.c
@@ -141,7 +141,7 @@ static bool geoip_bsearch(const struct geoip_subnet *range,
 }
 
 static bool
-xt_geoip_mt(const struct sk_buff *skb, const struct xt_action_param *par)
+xt_geoip_mt(const struct sk_buff *skb, struct xt_action_param *par)
 {
 	const struct xt_geoip_match_info *info = par->matchinfo;
 	const struct geoip_country_kernel *node;
diff --git a/extensions/xt_iface.c b/extensions/xt_iface.c
index e61dc9d..4bf5486 100644
--- a/extensions/xt_iface.c
+++ b/extensions/xt_iface.c
@@ -41,7 +41,7 @@ static const struct xt_iface_flag_pairs xt_iface_lookup[] =
 };
 
 static bool xt_iface_mt(const struct sk_buff *skb,
-    const struct xt_action_param *par)
+    struct xt_action_param *par)
 {
 	const struct xt_iface_mtinfo *info = par->matchinfo;
 	struct net_device *dev;
diff --git a/extensions/xt_ipp2p.c b/extensions/xt_ipp2p.c
index 0886fb1..25cdc61 100644
--- a/extensions/xt_ipp2p.c
+++ b/extensions/xt_ipp2p.c
@@ -808,7 +808,7 @@ static const struct {
 };
 
 static bool
-ipp2p_mt(const struct sk_buff *skb, const struct xt_action_param *par)
+ipp2p_mt(const struct sk_buff *skb, struct xt_action_param *par)
 {
 	const struct ipt_p2p_info *info = par->matchinfo;
 	const unsigned char  *haystack;
diff --git a/extensions/xt_ipv4options.c b/extensions/xt_ipv4options.c
index a887821..f7e8f95 100644
--- a/extensions/xt_ipv4options.c
+++ b/extensions/xt_ipv4options.c
@@ -29,7 +29,7 @@ static uint32_t ipv4options_rd(const uint8_t *data, int len)
 }
 
 static bool ipv4options_mt(const struct sk_buff *skb,
-    const struct xt_action_param *par)
+    struct xt_action_param *par)
 {
 	const struct xt_ipv4options_mtinfo1 *info = par->matchinfo;
 	const struct iphdr *iph = ip_hdr(skb);
diff --git a/extensions/xt_length2.c b/extensions/xt_length2.c
index ca495df..9ba3739 100644
--- a/extensions/xt_length2.c
+++ b/extensions/xt_length2.c
@@ -137,7 +137,7 @@ static bool xtlength_layer7(unsigned int *length, const struct sk_buff *skb,
 }
 
 static bool
-length2_mt(const struct sk_buff *skb, const struct xt_action_param *par)
+length2_mt(const struct sk_buff *skb, struct xt_action_param *par)
 {
 	const struct xt_length_mtinfo2 *info = par->matchinfo;
 	const struct iphdr *iph = ip_hdr(skb);
@@ -198,7 +198,7 @@ llayer4_proto(const struct sk_buff *skb, unsigned int *offset, bool *hotdrop)
 }
 
 static bool
-length2_mt6(const struct sk_buff *skb, const struct xt_action_param *par)
+length2_mt6(const struct sk_buff *skb, struct xt_action_param *par)
 {
 	const struct xt_length_mtinfo2 *info = par->matchinfo;
 	const struct ipv6hdr *iph = ipv6_hdr(skb);
diff --git a/extensions/xt_lscan.c b/extensions/xt_lscan.c
index 3af8621..88161c8 100644
--- a/extensions/xt_lscan.c
+++ b/extensions/xt_lscan.c
@@ -171,7 +171,7 @@ static inline unsigned int lscan_mt_full(int mark,
 }
 
 static bool
-lscan_mt(const struct sk_buff *skb, const struct xt_action_param *par)
+lscan_mt(const struct sk_buff *skb, struct xt_action_param *par)
 {
 	const struct xt_lscan_mtinfo *info = par->matchinfo;
 	enum ip_conntrack_info ctstate;
diff --git a/extensions/xt_psd.c b/extensions/xt_psd.c
index 4be8b4e..59e3780 100644
--- a/extensions/xt_psd.c
+++ b/extensions/xt_psd.c
@@ -100,7 +100,7 @@ static inline int hashfunc(struct in_addr addr)
 }
 
 static bool
-xt_psd_match(const struct sk_buff *pskb, const struct xt_action_param *match)
+xt_psd_match(const struct sk_buff *pskb, struct xt_action_param *match)
 {
 	const struct iphdr *iph;
 	const struct tcphdr *tcph;
diff --git a/extensions/xt_quota2.c b/extensions/xt_quota2.c
index 62f1274..4857008 100644
--- a/extensions/xt_quota2.c
+++ b/extensions/xt_quota2.c
@@ -189,7 +189,7 @@ static void quota_mt2_destroy(const struct xt_mtdtor_param *par)
 }
 
 static bool
-quota_mt2(const struct sk_buff *skb, const struct xt_action_param *par)
+quota_mt2(const struct sk_buff *skb, struct xt_action_param *par)
 {
 	struct xt_quota_mtinfo2 *q = (void *)par->matchinfo;
 	struct xt_quota_counter *e = q->master;