From: S.Çağlar Onur <caglar@cs.princeton.edu>
Date: Tue, 7 Dec 2010 21:00:52 +0000 (-0500)
Subject: adopt to new kernel interface
X-Git-Tag: linux-2.6-32-1~9
X-Git-Url: http://git.onelab.eu/?p=linux-2.6.git;a=commitdiff_plain;h=3d21584ec2f131cfe612e2ae2b132b55054434b7

adopt to new kernel interface
---

diff --git a/kernel-2.6.spec b/kernel-2.6.spec
index 0c29f0ea7..0dbd7cace 100644
--- a/kernel-2.6.spec
+++ b/kernel-2.6.spec
@@ -905,7 +905,8 @@ ApplyPatch linux-2.6-220-delta-ptrace-fix01.patch
 ApplyPatch linux-2.6-250-ipsets.patch
 ApplyPatch linux-2.6-510-ipod.patch
 ApplyPatch linux-2.6-521-packet-tagging.patch
-ApplyPatch linux-2.6-522-iptables-connection-tagging.patch
+# fails with -Wall build
+# ApplyPatch linux-2.6-522-iptables-connection-tagging.patch
 ApplyPatch linux-2.6-523-raw-sockets.patch
 ApplyPatch linux-2.6-524-peercred.patch
 ApplyPatch linux-2.6-525-sknid-elevator.patch
@@ -916,6 +917,7 @@ ApplyPatch linux-2.6-550-raise-default-nfile-ulimit.patch
 ApplyPatch linux-2.6-570-tagxid.patch
 ApplyPatch linux-2.6-580-show-proc-virt.patch
 ApplyPatch linux-2.6-590-dcookies-mm.patch
+# fails with -Wall build
 #ApplyPatch linux-2.6-591-chopstix-intern.patch
 ApplyPatch linux-2.6-640-netlink-audit-hack.patch
 ApplyPatch linux-2.6-650-hangcheck-reboot.patch
diff --git a/linux-2.6-522-iptables-connection-tagging.patch b/linux-2.6-522-iptables-connection-tagging.patch
index 99589db42..464d8adf5 100644
--- a/linux-2.6-522-iptables-connection-tagging.patch
+++ b/linux-2.6-522-iptables-connection-tagging.patch
@@ -408,29 +408,29 @@ index 0000000..f8553c5
 +MODULE_ALIAS("ipt_SETXID");
 +
 +static unsigned int
-+target_v2(struct sk_buff **pskb,
-+	  const struct net_device *in,
-+	  const struct net_device *out,
-+	  unsigned int hooknum,
-+	  const struct xt_target *target, const void *targinfo)
++target_v2(struct sk_buff *skb,
++	  const struct xt_target_param *par)
++
++
++
 +{
-+	const struct xt_setxid_target_info_v2 *setxidinfo = targinfo;
++	const struct xt_setxid_target_info_v2 *setxidinfo = par->targinfo;
 +
 +	switch (setxidinfo->mode) {
 +	case XT_SET_PACKET_XID:
-+		(*pskb)->skb_tag = setxidinfo->mark;
++		skb->skb_tag = setxidinfo->mark;
 +		break;
 +	}
 +	return XT_CONTINUE;
 +}
 +
 +static int
-+checkentry_v2(const char *tablename,
-+	      const void *entry,
-+	      const struct xt_target *target,
-+	      void *targinfo, unsigned int hook_mask)
++checkentry_v2(const struct xt_tgchk_param *par)
++
++
++
 +{
-+	struct xt_setxid_target_info_v2 *setxidinfo = targinfo;
++	struct xt_setxid_target_info_v2 *setxidinfo = par->targinfo;
 +
 +	if (setxidinfo->mode != XT_SET_PACKET_XID) {
 +		printk(KERN_WARNING "SETXID: unknown mode %u\n",