From c48c5db3884ab5ac80c9e3a7e2e9d4cf4a92e936 Mon Sep 17 00:00:00 2001
From: Jan Engelhardt <jengelh@medozas.de>
Date: Wed, 26 Jan 2011 11:50:03 +0100
Subject: [PATCH] --- yaml --- r: 236805 b: refs/heads/master c:
 ad86e1f27a9a97a9e50810b10bca678407b1d6fd h: refs/heads/master i:   236803:
 a399891bfe4dc427b8eb625185afed8f523f29f3 v: v3

---
 [refs]                                |  2 +-
 trunk/net/netfilter/ipvs/ip_vs_core.c |  4 +++-
 trunk/net/netfilter/ipvs/ip_vs_ctl.c  |  2 +-
 trunk/net/netfilter/xt_connlimit.c    | 12 ++++++++----
 4 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/[refs] b/[refs]
index d1e1b49f48e0..3a37541f936e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9f4e1ccd80530609bbceec68ae3831697b5c6a68
+refs/heads/master: ad86e1f27a9a97a9e50810b10bca678407b1d6fd
diff --git a/trunk/net/netfilter/ipvs/ip_vs_core.c b/trunk/net/netfilter/ipvs/ip_vs_core.c
index d889f4f6be99..f36a84f33efb 100644
--- a/trunk/net/netfilter/ipvs/ip_vs_core.c
+++ b/trunk/net/netfilter/ipvs/ip_vs_core.c
@@ -1894,7 +1894,9 @@ static int __net_init __ip_vs_init(struct net *net)
 
 static void __net_exit __ip_vs_cleanup(struct net *net)
 {
-	IP_VS_DBG(10, "ipvs netns %d released\n", net_ipvs(net)->gen);
+	struct netns_ipvs *ipvs = net_ipvs(net);
+
+	IP_VS_DBG(10, "ipvs netns %d released\n", ipvs->gen);
 }
 
 static struct pernet_operations ipvs_core_ops = {
diff --git a/trunk/net/netfilter/ipvs/ip_vs_ctl.c b/trunk/net/netfilter/ipvs/ip_vs_ctl.c
index 98df59a12453..68b8033a96f7 100644
--- a/trunk/net/netfilter/ipvs/ip_vs_ctl.c
+++ b/trunk/net/netfilter/ipvs/ip_vs_ctl.c
@@ -3556,7 +3556,7 @@ int __net_init __ip_vs_control_init(struct net *net)
 
 
 	ipvs->sysctl_hdr = register_net_sysctl_table(net, net_vs_ctl_path,
-						     tbl);
+						  vs_vars);
 	if (ipvs->sysctl_hdr == NULL)
 		goto err_reg;
 	ip_vs_new_estimator(net, ipvs->tot_stats);
diff --git a/trunk/net/netfilter/xt_connlimit.c b/trunk/net/netfilter/xt_connlimit.c
index 7fd3fd51f274..e029c4807404 100644
--- a/trunk/net/netfilter/xt_connlimit.c
+++ b/trunk/net/netfilter/xt_connlimit.c
@@ -185,11 +185,15 @@ connlimit_mt(const struct sk_buff *skb, struct xt_action_param *par)
 	int connections;
 
 	ct = nf_ct_get(skb, &ctinfo);
-	if (ct != NULL)
-		tuple_ptr = &ct->tuplehash[0].tuple;
-	else if (!nf_ct_get_tuplepr(skb, skb_network_offset(skb),
-				    par->family, &tuple))
+	if (ct != NULL) {
+		if (info->flags & XT_CONNLIMIT_DADDR)
+			tuple_ptr = &ct->tuplehash[IP_CT_DIR_REPLY].tuple;
+		else
+			tuple_ptr = &ct->tuplehash[IP_CT_DIR_ORIGINAL].tuple;
+	} else if (!nf_ct_get_tuplepr(skb, skb_network_offset(skb),
+				    par->family, &tuple)) {
 		goto hotdrop;
+	}
 
 	if (par->family == NFPROTO_IPV6) {
 		const struct ipv6hdr *iph = ipv6_hdr(skb);