---

yaml --- r: 348370 b: refs/heads/master c: 1310b95 h: refs/heads/master v: v3
git-mirror · Dec 26, 2012 · 8f5d03f · 8f5d03f
1 parent d8fee7b
commit 8f5d03f
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 32263dd1b43378b4f7d7796ed713f77e95f27e8a
+refs/heads/master: 1310b955c804975651dca6c674ebfd1cb2b4c7ff
diff --git a/trunk/net/netfilter/nf_conntrack_netlink.c b/trunk/net/netfilter/nf_conntrack_netlink.c
@@ -2624,7 +2624,7 @@ ctnetlink_create_expect(struct net *net, u16 zone,
 	if (!help) {
 		if (!cda[CTA_EXPECT_TIMEOUT]) {
 			err = -EINVAL;
-			goto out;
+			goto err_out;
 		}
 		exp->timeout.expires =
 		  jiffies + ntohl(nla_get_be32(cda[CTA_EXPECT_TIMEOUT])) * HZ;