From 7adfc9901b13fe6935c61de9c97ee9ebe73214c2 Mon Sep 17 00:00:00 2001
From: Hans Schillstrom <hans.schillstrom@ericsson.com>
Date: Mon, 3 Jan 2011 14:44:50 +0100
Subject: [PATCH] --- yaml --- r: 236605 b: refs/heads/master c:
 88fe2d372793a71ae4f6319a16f537d56a83906c h: refs/heads/master i:   236603:
 acb0191c90b18e3e687e848a38366913ade144f7 v: v3

---
 [refs]                                        |  2 +-
 trunk/net/netfilter/ipvs/ip_vs_proto.c        |  6 ++++++
 trunk/net/netfilter/ipvs/ip_vs_proto_ah_esp.c | 20 ++++---------------
 3 files changed, 11 insertions(+), 17 deletions(-)

diff --git a/[refs] b/[refs]
index 58613e822da3..2f8620b20c98 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9d934878e7870fbbbd8eaed2e467552536877def
+refs/heads/master: 88fe2d372793a71ae4f6319a16f537d56a83906c
diff --git a/trunk/net/netfilter/ipvs/ip_vs_proto.c b/trunk/net/netfilter/ipvs/ip_vs_proto.c
index 001b2f825043..9f609d4d5d58 100644
--- a/trunk/net/netfilter/ipvs/ip_vs_proto.c
+++ b/trunk/net/netfilter/ipvs/ip_vs_proto.c
@@ -315,6 +315,12 @@ static int __net_init __ip_vs_protocol_init(struct net *net)
 #endif
 #ifdef CONFIG_IP_VS_PROTO_SCTP
 	register_ip_vs_proto_netns(net, &ip_vs_protocol_sctp);
+#endif
+#ifdef CONFIG_IP_VS_PROTO_AH
+	register_ip_vs_proto_netns(net, &ip_vs_protocol_ah);
+#endif
+#ifdef CONFIG_IP_VS_PROTO_ESP
+	register_ip_vs_proto_netns(net, &ip_vs_protocol_esp);
 #endif
 	return 0;
 }
diff --git a/trunk/net/netfilter/ipvs/ip_vs_proto_ah_esp.c b/trunk/net/netfilter/ipvs/ip_vs_proto_ah_esp.c
index 3a0461117d3f..b8b37fafc988 100644
--- a/trunk/net/netfilter/ipvs/ip_vs_proto_ah_esp.c
+++ b/trunk/net/netfilter/ipvs/ip_vs_proto_ah_esp.c
@@ -117,26 +117,14 @@ ah_esp_conn_schedule(int af, struct sk_buff *skb, struct ip_vs_protocol *pp,
 	return 0;
 }
 
-static void ah_esp_init(struct ip_vs_protocol *pp)
-{
-	/* nothing to do now */
-}
-
-
-static void ah_esp_exit(struct ip_vs_protocol *pp)
-{
-	/* nothing to do now */
-}
-
-
 #ifdef CONFIG_IP_VS_PROTO_AH
 struct ip_vs_protocol ip_vs_protocol_ah = {
 	.name =			"AH",
 	.protocol =		IPPROTO_AH,
 	.num_states =		1,
 	.dont_defrag =		1,
-	.init =			ah_esp_init,
-	.exit =			ah_esp_exit,
+	.init =			NULL,
+	.exit =			NULL,
 	.conn_schedule =	ah_esp_conn_schedule,
 	.conn_in_get =		ah_esp_conn_in_get,
 	.conn_out_get =		ah_esp_conn_out_get,
@@ -159,8 +147,8 @@ struct ip_vs_protocol ip_vs_protocol_esp = {
 	.protocol =		IPPROTO_ESP,
 	.num_states =		1,
 	.dont_defrag =		1,
-	.init =			ah_esp_init,
-	.exit =			ah_esp_exit,
+	.init =			NULL,
+	.exit =			NULL,
 	.conn_schedule =	ah_esp_conn_schedule,
 	.conn_in_get =		ah_esp_conn_in_get,
 	.conn_out_get =		ah_esp_conn_out_get,