From 7125be8c4666c38879eafb0aa4168a5f7cddcbcf Mon Sep 17 00:00:00 2001
From: Al Viro <viro@zeniv.linux.org.uk>
Date: Thu, 30 Nov 2006 19:24:49 -0800
Subject: [PATCH] --- yaml --- r: 41962 b: refs/heads/master c:
 98a0824a0f33d051f31ca8ff59e289755b244ede h: refs/heads/master v: v3

---
 [refs]                                | 2 +-
 trunk/net/bridge/netfilter/ebtables.c | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 657667be8930..3ab94c92542a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 40642f95f5f818579bc4cc3ee084b033e662d5b3
+refs/heads/master: 98a0824a0f33d051f31ca8ff59e289755b244ede
diff --git a/trunk/net/bridge/netfilter/ebtables.c b/trunk/net/bridge/netfilter/ebtables.c
index 6ab7674ea454..46ab9b759269 100644
--- a/trunk/net/bridge/netfilter/ebtables.c
+++ b/trunk/net/bridge/netfilter/ebtables.c
@@ -717,7 +717,9 @@ static int check_chainloops(struct ebt_entries *chain, struct ebt_cl_stack *cl_s
 				BUGPRINT("loop\n");
 				return -1;
 			}
-			/* this can't be 0, so the above test is correct */
+			if (cl_s[i].hookmask & (1 << hooknr))
+				goto letscontinue;
+			/* this can't be 0, so the loop test is correct */
 			cl_s[i].cs.n = pos + 1;
 			pos = 0;
 			cl_s[i].cs.e = ((void *)e + e->next_offset);