diff options
| author | Pablo Neira Ayuso <pablo@netfilter.org> | 2014-10-30 15:51:25 (GMT) |
|---|---|---|
| committer | Pablo Neira Ayuso <pablo@netfilter.org> | 2014-10-30 15:52:30 (GMT) |
| commit | c3ac759ea6e9836d3040abed92f797383da4024f (patch) | |
| tree | 5bb7c634212871c4afa42fc6c6b3a36b58066029 | |
| parent | 8ac2bde2a4a05c38e2bd733bea94507cb1461e06 (diff) | |
| parent | d7701089118d23bfed03bad0a6b5cc5115990c9e (diff) | |
| download | linux-c3ac759ea6e9836d3040abed92f797383da4024f.tar.xz | |
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>
| -rw-r--r-- | net/netfilter/ipvs/ip_vs_xmit.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/net/netfilter/ipvs/ip_vs_xmit.c b/net/netfilter/ipvs/ip_vs_xmit.c index 91f17c1..5efa597 100644 --- a/net/netfilter/ipvs/ip_vs_xmit.c +++ b/net/netfilter/ipvs/ip_vs_xmit.c @@ -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 { |