From: Simon Horman <horms@verge.net.au>
To: netdev@vger.kernel.org, netfilter-devel@vger.kernel.org,
netfilter@vger.kernel.org, lvs-devel@vger.kernel.org
Cc: Julian Anastasov <ja@ssi.bg>,
Hans Schillstrom <hans@schillstrom.com>,
Simon Horman <horms@verge.net.au>
Subject: [PATCH 02/14] IPVS: Add sysctl_snat_reroute()
Date: Fri, 4 Feb 2011 18:46:10 +0900 [thread overview]
Message-ID: <1296812782-14953-3-git-send-email-horms@verge.net.au> (raw)
In-Reply-To: <1296812782-14953-1-git-send-email-horms@verge.net.au>
In preparation for not including sysctl_snat_reroute in
struct netns_ipvs when CONFIG_SYCTL is not defined.
Signed-off-by: Simon Horman <horms@verge.net.au>
---
net/netfilter/ipvs/ip_vs_core.c | 20 ++++++++++++++++----
1 files changed, 16 insertions(+), 4 deletions(-)
diff --git a/net/netfilter/ipvs/ip_vs_core.c b/net/netfilter/ipvs/ip_vs_core.c
index c4c8199..3abc009 100644
--- a/net/netfilter/ipvs/ip_vs_core.c
+++ b/net/netfilter/ipvs/ip_vs_core.c
@@ -599,6 +599,20 @@ int ip_vs_leave(struct ip_vs_service *svc, struct sk_buff *skb,
return NF_DROP;
}
+#ifdef CONFIG_SYSCTL
+
+static int sysctl_snat_reroute(struct sk_buff *skb)
+{
+ struct netns_ipvs *ipvs = net_ipvs(skb_net(skb));
+ return ipvs->sysctl_snat_reroute;
+}
+
+#else
+
+static int sysctl_snat_reroute(struct sk_buff *skb) { return 0; }
+
+#endif
+
__sum16 ip_vs_checksum_complete(struct sk_buff *skb, int offset)
{
return csum_fold(skb_checksum(skb, offset, skb->len - offset, 0));
@@ -633,15 +647,13 @@ static inline int ip_vs_gather_frags_v6(struct sk_buff *skb, u_int32_t user)
static int ip_vs_route_me_harder(int af, struct sk_buff *skb)
{
- struct netns_ipvs *ipvs = net_ipvs(skb_net(skb));
next prev parent reply other threads:[~2011-02-04 9:46 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-02-04 9:46 [rfc] IPVS: Remove conditionally include sysctl code Simon Horman
2011-02-04 9:46 ` [PATCH 01/14] IPVS: Add ip_vs_route_me_harder() Simon Horman
2011-02-04 9:46 ` Simon Horman [this message]
2011-02-04 9:46 ` [PATCH 03/14] IPVS: Add sysctl_nat_icmp_send() Simon Horman
2011-02-04 9:46 ` [PATCH 04/14] IPVS: Add {sysctl_sync_threshold,period}() Simon Horman
2011-02-04 9:46 ` [PATCH 05/14] IPVS: Add sysctl_sync_ver() Simon Horman
2011-02-04 9:46 ` [PATCH 06/14] IPVS: Add sysctl_expire_nodest_conn() Simon Horman
2011-02-04 9:46 ` [PATCH 07/14] IPVS: Add expire_quiescent_template() Simon Horman
2011-02-04 9:46 ` [PATCH 08/14] IPVS: Conditinally use sysctl_lblc{r}_expiration Simon Horman
2011-02-04 9:46 ` [PATCH 09/14] IPVS: ip_vs_todrop() becomes a noop when CONFIG_SYSCTL is undefined Simon Horman
2011-02-04 9:46 ` [PATCH 10/14] IPVS: Conditional ip_vs_conntrack_enabled() Simon Horman
2011-02-04 9:46 ` [PATCH 11/14] IPVS: Minimise ip_vs_leave when CONFIG_SYSCTL is undefined Simon Horman
2011-02-04 9:46 ` [PATCH 12/14] IPVS: Conditionally define and use ip_vs_lblc{r}_table Simon Horman
2011-02-04 9:46 ` [PATCH 13/14] IPVS: Add __ip_vs_control_{init,cleanup}_sysctl() Simon Horman
2011-02-04 9:46 ` [PATCH 14/14] IPVS: Conditionally include sysctl members of struct netns_ipvs 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=1296812782-14953-3-git-send-email-horms@verge.net.au \
--to=horms@verge.net.au \
--cc=hans@schillstrom.com \
--cc=ja@ssi.bg \
--cc=lvs-devel@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=netfilter-devel@vger.kernel.org \
--cc=netfilter@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).