From: Simon Horman <horms@verge.net.au>
To: netfilter-devel@vger.kernel.org, lvs-devel@vger.kernel.org,
netdev@vger.kernel.org
Cc: Patrick McHardy <kaber@trash.net>, Julian Anastasov <ja@ssi.bg>,
Hans Schillstrom <hans.schillstrom@ericsson.com>,
Simon Horman <horms@verge.net.au>
Subject: [PATCH 09/22] IPVS: netns preparation for proto_ah_esp
Date: Thu, 6 Jan 2011 15:16:05 +0900 [thread overview]
Message-ID: <1294294578-8601-10-git-send-email-horms@verge.net.au> (raw)
In-Reply-To: <1294294578-8601-1-git-send-email-horms@verge.net.au>
From: Hans Schillstrom <hans.schillstrom@ericsson.com>
In this phase (one), all local vars will be moved to ipvs struct.
Remaining work, add param struct net *net to a couple of
functions that common for all protos.
Signed-off-by: Hans Schillstrom <hans.schillstrom@ericsson.com>
Signed-off-by: Simon Horman <horms@verge.net.au>
---
net/netfilter/ipvs/ip_vs_proto.c | 6 ++++++
net/netfilter/ipvs/ip_vs_proto_ah_esp.c | 20 ++++----------------
2 files changed, 10 insertions(+), 16 deletions(-)
diff --git a/net/netfilter/ipvs/ip_vs_proto.c b/net/netfilter/ipvs/ip_vs_proto.c
index 001b2f8..9f609d4 100644
--- a/net/netfilter/ipvs/ip_vs_proto.c
+++ b/net/netfilter/ipvs/ip_vs_proto.c
@@ -316,6 +316,12 @@ static int __net_init __ip_vs_protocol_init(struct net *net)
#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/net/netfilter/ipvs/ip_vs_proto_ah_esp.c b/net/netfilter/ipvs/ip_vs_proto_ah_esp.c
index 3a04611..b8b37fa 100644
--- a/net/netfilter/ipvs/ip_vs_proto_ah_esp.c
+++ b/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,
--
1.7.2.3
next prev parent reply other threads:[~2011-01-06 6:16 UTC|newest]
Thread overview: 31+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-01-06 6:15 [GIT PULL nf-next-2.6] ipvs namespaces Simon Horman
2011-01-06 6:15 ` [PATCH 01/22] IPVS: netns, add basic init per netns Simon Horman
2011-01-06 6:15 ` [PATCH 02/22] IPVS: netns to services part 1 Simon Horman
2011-01-06 6:15 ` [PATCH 03/22] IPVS: netns awarness to lblcr sheduler Simon Horman
2011-01-06 6:16 ` [PATCH 04/22] IPVS: netns awarness to lblc sheduler Simon Horman
2011-01-06 6:16 ` [PATCH 05/22] IPVS: netns, prepare protocol Simon Horman
2011-01-06 6:16 ` [PATCH 06/22] IPVS: netns preparation for proto_tcp Simon Horman
2011-01-06 6:16 ` [PATCH 07/22] IPVS: netns preparation for proto_udp Simon Horman
2011-01-06 6:16 ` [PATCH 08/22] IPVS: netns preparation for proto_sctp Simon Horman
2011-01-06 6:16 ` Simon Horman [this message]
2011-01-06 6:16 ` [PATCH 10/22] IPVS: netns, use ip_vs_proto_data as param Simon Horman
2011-01-06 6:16 ` [PATCH 11/22] IPVS: netns, common protocol changes and use of appcnt Simon Horman
2011-01-06 6:16 ` [PATCH 12/22] IPVS: netns awareness to ip_vs_app Simon Horman
2011-01-06 6:16 ` [PATCH 13/22] IPVS: netns awareness to ip_vs_est Simon Horman
2011-01-06 6:16 ` [PATCH 14/22] IPVS: netns awareness to ip_vs_sync Simon Horman
2011-01-06 6:16 ` [PATCH 15/22] IPVS: netns, ip_vs_stats and its procfs Simon Horman
2011-01-06 6:16 ` [PATCH 16/22] IPVS: netns, connection hash got net as param Simon Horman
2011-01-06 6:16 ` [PATCH 17/22] IPVS: netns, ip_vs_ctl local vars moved to ipvs struct Simon Horman
2011-01-06 6:16 ` [PATCH 18/22] IPVS: netns, defense work timer Simon Horman
2011-01-06 6:16 ` [PATCH 19/22] IPVS: netns, trash handling Simon Horman
2011-01-06 6:16 ` [PATCH 20/22] IPVS: netns, svc counters moved in ip_vs_ctl,c Simon Horman
2011-01-06 6:16 ` [PATCH 21/22] IPVS: netns, misc init_net removal in core Simon Horman
2011-01-06 6:16 ` [PATCH 22/22] IPVS: netns, final patch enabling network name space Simon Horman
2011-01-11 6:21 ` [GIT PULL nf-next-2.6] ipvs namespaces Simon Horman
2011-01-11 22:34 ` David Miller
2011-01-11 23:01 ` Simon Horman
2011-01-12 0:15 ` Pablo Neira Ayuso
2011-01-12 0:20 ` Simon Horman
2011-01-12 20:29 ` Pablo Neira Ayuso
2011-01-13 1:57 ` Simon Horman
-- strict thread matches above, loose matches on Subject: below --
2011-01-13 1:52 [PATCH 00/22] ipvs namespaces v3.3 Simon Horman
2011-01-13 1:52 ` [PATCH 09/22] IPVS: netns preparation for proto_ah_esp Simon Horman
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1294294578-8601-10-git-send-email-horms@verge.net.au \
--to=horms@verge.net.au \
--cc=hans.schillstrom@ericsson.com \
--cc=ja@ssi.bg \
--cc=kaber@trash.net \
--cc=lvs-devel@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=netfilter-devel@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).