Merge branch 'ipvs-next'
Simon Horman says: ==================== The single patch in this series fixes some minor fallout from adding support IPv6 real servers in IPv4 virtual-services and vice versa. It should not have any run-time affect other than perhaps saving a few cycles. ==================== Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
This commit is contained in:
commit
c3ac759ea6
|
@ -293,7 +293,6 @@ __ip_vs_get_out_rt(int skb_af, struct sk_buff *skb, struct ip_vs_dest *dest,
|
|||
&dest->addr.ip, &dest_dst->dst_saddr.ip,
|
||||
atomic_read(&rt->dst.__refcnt));
|
||||
}
|
||||
daddr = dest->addr.ip;
|
||||
if (ret_saddr)
|
||||
*ret_saddr = dest_dst->dst_saddr.ip;
|
||||
} else {
|
||||
|
|
Loading…
Reference in a new issue