Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c3ac759e authored by Pablo Neira Ayuso's avatar Pablo Neira Ayuso
Browse files

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: default avatarPablo Neira Ayuso <pablo@netfilter.org>
parents 8ac2bde2 d7701089

net/netfilter/ipvs/ip_vs_xmit.c

+0 −1
Original line number Original line Diff line number Diff line
@@ -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,

				  &dest->addr.ip, &dest_dst->dst_saddr.ip,

				  atomic_read(&rt->dst.__refcnt));

				  atomic_read(&rt->dst.__refcnt));

		}

		}

		daddr = dest->addr.ip;

		if (ret_saddr)

		if (ret_saddr)

			*ret_saddr = dest_dst->dst_saddr.ip;

			*ret_saddr = dest_dst->dst_saddr.ip;

	} else {

	} else {