---

yaml --- r: 14999 b: refs/heads/master c: 2fdf1fa h: refs/heads/master i: 14997: e085fff 14995: 53ef83d 14991: ec9790f v: v3
git-mirror · Dec 5, 2005 · 223dff8 · 223dff8
1 parent 448e3a0
commit 223dff8
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 5 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 266c8543480e2202ab63d1d604a5ca049f350cd8
+refs/heads/master: 2fdf1faa8e33082d691bcba18814276f2bd5a6f0
diff --git a/trunk/net/ipv4/netfilter/ip_conntrack_netlink.c b/trunk/net/ipv4/netfilter/ip_conntrack_netlink.c
@@ -728,11 +728,9 @@ ctnetlink_del_conntrack(struct sock *ctnl, struct sk_buff *skb,
 			return -ENOENT;
 		}
 	}	
-	if (del_timer(&ct->timeout)) {
-		ip_conntrack_put(ct);
+	if (del_timer(&ct->timeout))
 		ct->timeout.function((unsigned long)ct);
-		return 0;
-	}
+
 	ip_conntrack_put(ct);
 	DEBUGP("leaving\n");