diff options
Diffstat (limited to 'net/ipv4/ipvs')
-rw-r--r-- | net/ipv4/ipvs/ip_vs_core.c | 2 | ||||
-rw-r--r-- | net/ipv4/ipvs/ip_vs_ctl.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/net/ipv4/ipvs/ip_vs_core.c b/net/ipv4/ipvs/ip_vs_core.c index 041f5120808a..963981a9d501 100644 --- a/net/ipv4/ipvs/ip_vs_core.c +++ b/net/ipv4/ipvs/ip_vs_core.c | |||
@@ -423,7 +423,7 @@ int ip_vs_leave(struct ip_vs_service *svc, struct sk_buff *skb, | |||
423 | and the destination is RTN_UNICAST (and not local), then create | 423 | and the destination is RTN_UNICAST (and not local), then create |
424 | a cache_bypass connection entry */ | 424 | a cache_bypass connection entry */ |
425 | if (sysctl_ip_vs_cache_bypass && svc->fwmark | 425 | if (sysctl_ip_vs_cache_bypass && svc->fwmark |
426 | && (inet_addr_type(iph->daddr) == RTN_UNICAST)) { | 426 | && (inet_addr_type(&init_net, iph->daddr) == RTN_UNICAST)) { |
427 | int ret, cs; | 427 | int ret, cs; |
428 | struct ip_vs_conn *cp; | 428 | struct ip_vs_conn *cp; |
429 | 429 | ||
diff --git a/net/ipv4/ipvs/ip_vs_ctl.c b/net/ipv4/ipvs/ip_vs_ctl.c index 9fecfe7d1164..94c5767c8e01 100644 --- a/net/ipv4/ipvs/ip_vs_ctl.c +++ b/net/ipv4/ipvs/ip_vs_ctl.c | |||
@@ -704,7 +704,7 @@ __ip_vs_update_dest(struct ip_vs_service *svc, | |||
704 | conn_flags = udest->conn_flags | IP_VS_CONN_F_INACTIVE; | 704 | conn_flags = udest->conn_flags | IP_VS_CONN_F_INACTIVE; |
705 | 705 | ||
706 | /* check if local node and update the flags */ | 706 | /* check if local node and update the flags */ |
707 | if (inet_addr_type(udest->addr) == RTN_LOCAL) { | 707 | if (inet_addr_type(&init_net, udest->addr) == RTN_LOCAL) { |
708 | conn_flags = (conn_flags & ~IP_VS_CONN_F_FWD_MASK) | 708 | conn_flags = (conn_flags & ~IP_VS_CONN_F_FWD_MASK) |
709 | | IP_VS_CONN_F_LOCALNODE; | 709 | | IP_VS_CONN_F_LOCALNODE; |
710 | } | 710 | } |
@@ -756,7 +756,7 @@ ip_vs_new_dest(struct ip_vs_service *svc, struct ip_vs_dest_user *udest, | |||
756 | 756 | ||
757 | EnterFunction(2); | 757 | EnterFunction(2); |
758 | 758 | ||
759 | atype = inet_addr_type(udest->addr); | 759 | atype = inet_addr_type(&init_net, udest->addr); |
760 | if (atype != RTN_LOCAL && atype != RTN_UNICAST) | 760 | if (atype != RTN_LOCAL && atype != RTN_UNICAST) |
761 | return -EINVAL; | 761 | return -EINVAL; |
762 | 762 | ||