Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input

[cascardo/linux.git] / net / netfilter / ipvs / ip_vs_xmit.c

diff --git a/net/netfilter/ipvs/ip_vs_xmit.c b/net/netfilter/ipvs/ip_vs_xmit.c
index bd90bf8..3aedbda 100644 (file)
--- 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 {
@@ -344,7 +343,7 @@ __ip_vs_get_out_rt(int skb_af, struct sk_buff *skb, struct ip_vs_dest *dest,
        skb_dst_drop(skb);
        if (noref) {
                if (!local)
-                       skb_dst_set_noref_force(skb, &rt->dst);
+                       skb_dst_set_noref(skb, &rt->dst);
                else
                        skb_dst_set(skb, dst_clone(&rt->dst));
        } else
@@ -488,7 +487,7 @@ __ip_vs_get_out_rt_v6(int skb_af, struct sk_buff *skb, struct ip_vs_dest *dest,
        skb_dst_drop(skb);
        if (noref) {
                if (!local)
-                       skb_dst_set_noref_force(skb, &rt->dst);
+                       skb_dst_set_noref(skb, &rt->dst);
                else
                        skb_dst_set(skb, dst_clone(&rt->dst));
        } else