mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-04 09:59:32 +00:00
ipvs: Pass ipvs into __ip_vs_get_out_rt_v6
Signed-off-by: "Eric W. Biederman" <ebiederm@xmission.com> Acked-by: Julian Anastasov <ja@ssi.bg> Signed-off-by: Simon Horman <horms@verge.net.au>
This commit is contained in:
parent
ecfe87b884
commit
f5745f8ae6
1 changed files with 13 additions and 8 deletions
|
@ -404,11 +404,12 @@ __ip_vs_route_output_v6(struct net *net, struct in6_addr *daddr,
|
|||
* Get route to destination or remote server
|
||||
*/
|
||||
static int
|
||||
__ip_vs_get_out_rt_v6(int skb_af, struct sk_buff *skb, struct ip_vs_dest *dest,
|
||||
__ip_vs_get_out_rt_v6(struct netns_ipvs *ipvs, int skb_af, struct sk_buff *skb,
|
||||
struct ip_vs_dest *dest,
|
||||
struct in6_addr *daddr, struct in6_addr *ret_saddr,
|
||||
struct ip_vs_iphdr *ipvsh, int do_xfrm, int rt_mode)
|
||||
{
|
||||
struct net *net = dev_net(skb_dst(skb)->dev);
|
||||
struct net *net = ipvs->net;
|
||||
struct ip_vs_dest_dst *dest_dst;
|
||||
struct rt6_info *rt; /* Route to the other host */
|
||||
struct dst_entry *dst;
|
||||
|
@ -663,7 +664,8 @@ ip_vs_bypass_xmit_v6(struct sk_buff *skb, struct ip_vs_conn *cp,
|
|||
EnterFunction(10);
|
||||
|
||||
rcu_read_lock();
|
||||
if (__ip_vs_get_out_rt_v6(cp->af, skb, NULL, &iph->daddr, NULL,
|
||||
if (__ip_vs_get_out_rt_v6(cp->ipvs, cp->af, skb, NULL,
|
||||
&iph->daddr, NULL,
|
||||
ipvsh, 0, IP_VS_RT_MODE_NON_LOCAL) < 0)
|
||||
goto tx_error;
|
||||
|
||||
|
@ -799,7 +801,8 @@ ip_vs_nat_xmit_v6(struct sk_buff *skb, struct ip_vs_conn *cp,
|
|||
IP_VS_DBG(10, "filled cport=%d\n", ntohs(*p));
|
||||
}
|
||||
|
||||
local = __ip_vs_get_out_rt_v6(cp->af, skb, cp->dest, &cp->daddr.in6,
|
||||
local = __ip_vs_get_out_rt_v6(cp->ipvs, cp->af, skb, cp->dest,
|
||||
&cp->daddr.in6,
|
||||
NULL, ipvsh, 0,
|
||||
IP_VS_RT_MODE_LOCAL |
|
||||
IP_VS_RT_MODE_NON_LOCAL |
|
||||
|
@ -1083,7 +1086,8 @@ ip_vs_tunnel_xmit_v6(struct sk_buff *skb, struct ip_vs_conn *cp,
|
|||
EnterFunction(10);
|
||||
|
||||
rcu_read_lock();
|
||||
local = __ip_vs_get_out_rt_v6(cp->af, skb, cp->dest, &cp->daddr.in6,
|
||||
local = __ip_vs_get_out_rt_v6(cp->ipvs, cp->af, skb, cp->dest,
|
||||
&cp->daddr.in6,
|
||||
&saddr, ipvsh, 1,
|
||||
IP_VS_RT_MODE_LOCAL |
|
||||
IP_VS_RT_MODE_NON_LOCAL |
|
||||
|
@ -1209,7 +1213,8 @@ ip_vs_dr_xmit_v6(struct sk_buff *skb, struct ip_vs_conn *cp,
|
|||
EnterFunction(10);
|
||||
|
||||
rcu_read_lock();
|
||||
local = __ip_vs_get_out_rt_v6(cp->af, skb, cp->dest, &cp->daddr.in6,
|
||||
local = __ip_vs_get_out_rt_v6(cp->ipvs, cp->af, skb, cp->dest,
|
||||
&cp->daddr.in6,
|
||||
NULL, ipvsh, 0,
|
||||
IP_VS_RT_MODE_LOCAL |
|
||||
IP_VS_RT_MODE_NON_LOCAL |
|
||||
|
@ -1370,8 +1375,8 @@ ip_vs_icmp_xmit_v6(struct sk_buff *skb, struct ip_vs_conn *cp,
|
|||
IP_VS_RT_MODE_LOCAL | IP_VS_RT_MODE_NON_LOCAL |
|
||||
IP_VS_RT_MODE_RDR : IP_VS_RT_MODE_NON_LOCAL;
|
||||
rcu_read_lock();
|
||||
local = __ip_vs_get_out_rt_v6(cp->af, skb, cp->dest, &cp->daddr.in6,
|
||||
NULL, ipvsh, 0, rt_mode);
|
||||
local = __ip_vs_get_out_rt_v6(cp->ipvs, cp->af, skb, cp->dest,
|
||||
&cp->daddr.in6, NULL, ipvsh, 0, rt_mode);
|
||||
if (local < 0)
|
||||
goto tx_error;
|
||||
rt = (struct rt6_info *) skb_dst(skb);
|
||||
|
|
Loading…
Reference in a new issue