From 7ce4a0138870933bf7270bd847c5307e01c4c8d9 Mon Sep 17 00:00:00 2001
From: Jesper Juhl <jj@chaosbits.net>
Date: Sun, 17 Jul 2011 19:56:38 +0200
Subject: [PATCH] --- yaml --- r: 258877 b: refs/heads/master c:
 f0da7ee410e63a1521af734c3970acc1470e8c50 h: refs/heads/master i:   258875:
 055ffd4ee97ed84bbb164d081f8ddd662f594b7e v: v3

---
 [refs]                                | 2 +-
 trunk/net/bridge/netfilter/ebt_ulog.c | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 9ce0409b9c9d..da2c36ba578b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9b42f06517ae19d6519e9c54eac5ea58d00f3028
+refs/heads/master: f0da7ee410e63a1521af734c3970acc1470e8c50
diff --git a/trunk/net/bridge/netfilter/ebt_ulog.c b/trunk/net/bridge/netfilter/ebt_ulog.c
index 26377e96fa1c..bf2a333ca7c7 100644
--- a/trunk/net/bridge/netfilter/ebt_ulog.c
+++ b/trunk/net/bridge/netfilter/ebt_ulog.c
@@ -216,7 +216,6 @@ static void ebt_ulog_packet(unsigned int hooknr, const struct sk_buff *skb,
 nlmsg_failure:
 	pr_debug("error during NLMSG_PUT. This should "
 		 "not happen, please report to author.\n");
-	goto unlock;
 alloc_failure:
 	goto unlock;
 }