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 21/22] IPVS: netns, misc init_net removal in core.
Date: Thu, 6 Jan 2011 15:16:17 +0900 [thread overview]
Message-ID: <1294294578-8601-22-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>
init_net removed in __ip_vs_addr_is_local_v6, and got net as param.
Signed-off-by: Hans Schillstrom <hans.schillstrom@ericsson.com>
Signed-off-by: Simon Horman <horms@verge.net.au>
---
net/netfilter/ipvs/ip_vs_core.c | 6 ++++--
net/netfilter/ipvs/ip_vs_ctl.c | 9 +++++----
2 files changed, 9 insertions(+), 6 deletions(-)
diff --git a/net/netfilter/ipvs/ip_vs_core.c b/net/netfilter/ipvs/ip_vs_core.c
index bdda346..9e10c7a 100644
--- a/net/netfilter/ipvs/ip_vs_core.c
+++ b/net/netfilter/ipvs/ip_vs_core.c
@@ -499,6 +499,7 @@ ip_vs_schedule(struct ip_vs_service *svc, struct sk_buff *skb,
int ip_vs_leave(struct ip_vs_service *svc, struct sk_buff *skb,
struct ip_vs_proto_data *pd)
{
+ struct net *net;
struct netns_ipvs *ipvs;
__be16 _ports[2], *pptr;
struct ip_vs_iphdr iph;
@@ -511,18 +512,19 @@ int ip_vs_leave(struct ip_vs_service *svc, struct sk_buff *skb,
ip_vs_service_put(svc);
return NF_DROP;
}
+ net = skb_net(skb);
#ifdef CONFIG_IP_VS_IPV6
if (svc->af == AF_INET6)
unicast = ipv6_addr_type(&iph.daddr.in6) & IPV6_ADDR_UNICAST;
else
#endif
- unicast = (inet_addr_type(&init_net, iph.daddr.ip) == RTN_UNICAST);
+ unicast = (inet_addr_type(net, iph.daddr.ip) == RTN_UNICAST);
/* if it is fwmark-based service, the cache_bypass sysctl is up
and the destination is a non-local unicast, then create
a cache_bypass connection entry */
- ipvs = net_ipvs(skb_net(skb));
+ ipvs = net_ipvs(net);
if (ipvs->sysctl_cache_bypass && svc->fwmark && unicast) {
int ret, cs;
struct ip_vs_conn *cp;
diff --git a/net/netfilter/ipvs/ip_vs_ctl.c b/net/netfilter/ipvs/ip_vs_ctl.c
index 090eba7..d37a6d8 100644
--- a/net/netfilter/ipvs/ip_vs_ctl.c
+++ b/net/netfilter/ipvs/ip_vs_ctl.c
@@ -71,7 +71,8 @@ int ip_vs_get_debug_level(void)
#ifdef CONFIG_IP_VS_IPV6
/* Taken from rt6_fill_node() in net/ipv6/route.c, is there a better way? */
-static int __ip_vs_addr_is_local_v6(const struct in6_addr *addr)
+static int __ip_vs_addr_is_local_v6(struct net *net,
+ const struct in6_addr *addr)
{
struct rt6_info *rt;
struct flowi fl = {
@@ -82,7 +83,7 @@ static int __ip_vs_addr_is_local_v6(const struct in6_addr *addr)
.saddr = { .s6_addr32 = {0, 0, 0, 0} }, } },
};
- rt = (struct rt6_info *)ip6_route_output(&init_net, NULL, &fl);
+ rt = (struct rt6_info *)ip6_route_output(net, NULL, &fl);
if (rt && rt->rt6i_dev && (rt->rt6i_dev->flags & IFF_LOOPBACK))
return 1;
@@ -812,12 +813,12 @@ ip_vs_new_dest(struct ip_vs_service *svc, struct ip_vs_dest_user_kern *udest,
atype = ipv6_addr_type(&udest->addr.in6);
if ((!(atype & IPV6_ADDR_UNICAST) ||
atype & IPV6_ADDR_LINKLOCAL) &&
- !__ip_vs_addr_is_local_v6(&udest->addr.in6))
+ !__ip_vs_addr_is_local_v6(svc->net, &udest->addr.in6))
return -EINVAL;
} else
#endif
{
- atype = inet_addr_type(&init_net, udest->addr.ip);
+ atype = inet_addr_type(svc->net, udest->addr.ip);
if (atype != RTN_LOCAL && atype != RTN_UNICAST)
return -EINVAL;
}
--
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 ` [PATCH 09/22] IPVS: netns preparation for proto_ah_esp Simon Horman
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 ` Simon Horman [this message]
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:53 ` [PATCH 21/22] IPVS: netns, misc init_net removal in core 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-22-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).