From de5f445cd34ac7b7b8e2c8f39159bdf0f5756808 Mon Sep 17 00:00:00 2001
From: Patrick McHardy <kaber@trash.net>
Date: Mon, 17 Dec 2007 21:45:52 -0800
Subject: [PATCH] --- yaml --- r: 78495 b: refs/heads/master c:
 ac8e27fd89ca16e02fa1f911480bc46d64edc9da h: refs/heads/master i:   78493:
 1977648eaf85f3f61385871f446569ab5de3b29e   78491:
 07f768b86b68d028dab16842f942c622b1b772d3   78487:
 2559456aeed71292fbf682b6ad453e90081261b7   78479:
 16d6dec9dc6d17e8bdd9587cc00d1ea4fa609916   78463:
 41cb137f1030ec0d67a3172fa3b24193ce1feacd v: v3

---
 [refs]                               | 2 +-
 trunk/net/ipv4/netfilter/ip_tables.c | 8 +-------
 2 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/[refs] b/[refs]
index 3a0851ea1909..aa6a2be93964 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 03bffc1341c757e4b15a5a6058ad624e28b4801e
+refs/heads/master: ac8e27fd89ca16e02fa1f911480bc46d64edc9da
diff --git a/trunk/net/ipv4/netfilter/ip_tables.c b/trunk/net/ipv4/netfilter/ip_tables.c
index 64ffe57ef1b3..a8f1a2a6c1d4 100644
--- a/trunk/net/ipv4/netfilter/ip_tables.c
+++ b/trunk/net/ipv4/netfilter/ip_tables.c
@@ -1479,12 +1479,6 @@ struct compat_ipt_replace {
 	struct compat_ipt_entry	entries[0];
 };
 
-static inline int compat_copy_match_to_user(struct ipt_entry_match *m,
-		void __user **dstptr, compat_uint_t *size)
-{
-	return xt_compat_match_to_user(m, dstptr, size);
-}
-
 static int
 compat_copy_entry_to_user(struct ipt_entry *e, void __user **dstptr,
 			  compat_uint_t *size, struct xt_counters *counters,
@@ -1506,7 +1500,7 @@ compat_copy_entry_to_user(struct ipt_entry *e, void __user **dstptr,
 		goto out;
 
 	*dstptr += sizeof(struct compat_ipt_entry);
-	ret = IPT_MATCH_ITERATE(e, compat_copy_match_to_user, dstptr, size);
+	ret = IPT_MATCH_ITERATE(e, xt_compat_match_to_user, dstptr, size);
 	target_offset = e->target_offset - (origsize - *size);
 	if (ret)
 		goto out;