ipv6: Never schedule DAD timer on dead address

[safe/jmp/linux-2.6] / net / ipv4 / ip_output.c

diff --git a/net/ipv4/ip_output.c b/net/ipv4/ip_output.c
index d979710..9a4a6c9 100644 (file)
--- a/net/ipv4/ip_output.c
+++ b/net/ipv4/ip_output.c
@@ -120,7 +120,7 @@ static int ip_dev_loopback_xmit(struct sk_buff *newskb)
        newskb->pkt_type = PACKET_LOOPBACK;
        newskb->ip_summed = CHECKSUM_UNNECESSARY;
        WARN_ON(!skb_dst(newskb));
-       netif_rx(newskb);
+       netif_rx_ni(newskb);
        return 0;
 }
 
@@ -318,10 +318,12 @@ int ip_queue_xmit(struct sk_buff *skb)
        struct ip_options *opt = inet->opt;
        struct rtable *rt;
        struct iphdr *iph;
+       int res;
 
        /* Skip all of this if the packet is already routed,
         * f.e. by something like SCTP.
         */
+       rcu_read_lock();
        rt = skb_rtable(skb);
        if (rt != NULL)
                goto packet_routed;
@@ -359,7 +361,7 @@ int ip_queue_xmit(struct sk_buff *skb)
                }
                sk_setup_caps(sk, &rt->u.dst);
        }
-       skb_dst_set(skb, dst_clone(&rt->u.dst));
+       skb_dst_set_noref(skb, &rt->u.dst);
 
 packet_routed:
        if (opt && opt->is_strictroute && rt->rt_dst != rt->rt_gateway)
@@ -391,9 +393,12 @@ packet_routed:
        skb->priority = sk->sk_priority;
        skb->mark = sk->sk_mark;
 
-       return ip_local_out(skb);
+       res = ip_local_out(skb);
+       rcu_read_unlock();
+       return res;
 
 no_route:
+       rcu_read_unlock();
        IP_INC_STATS(sock_net(sk), IPSTATS_MIB_OUTNOROUTES);
        kfree_skb(skb);
        return -EHOSTUNREACH;