1 files changed, 13 insertions, 15 deletions

diff --git a/net/ipv4/ip_output.c b/net/ipv4/ip_output.c
index 341779e685d9..08349267ceb4 100644
--- a/net/ipv4/ip_output.c
+++ b/net/ipv4/ip_output.c
@@ -142,7 +142,7 @@ int ip_build_and_send_pkt(struct sk_buff *skb, struct sock *sk,
                           __be32 saddr, __be32 daddr, struct ip_options *opt)
 {
         struct inet_sock *inet = inet_sk(sk);
-        struct rtable *rt = (struct rtable *)skb->dst;
+        struct rtable *rt = skb->rtable;
         struct iphdr *iph;
 
         /* Build the IP header. */
@@ -240,7 +240,7 @@ static int ip_finish_output(struct sk_buff *skb)
 int ip_mc_output(struct sk_buff *skb)
 {
         struct sock *sk = skb->sk;
-        struct rtable *rt = (struct rtable*)skb->dst;
+        struct rtable *rt = skb->rtable;
         struct net_device *dev = rt->u.dst.dev;
 
         /*
@@ -321,7 +321,7 @@ int ip_queue_xmit(struct sk_buff *skb, int ipfragok)
         /* Skip all of this if the packet is already routed,
          * f.e. by something like SCTP.
          */
-        rt = (struct rtable *) skb->dst;
+        rt = skb->rtable;
         if (rt != NULL)
                 goto packet_routed;
 
@@ -351,7 +351,7 @@ int ip_queue_xmit(struct sk_buff *skb, int ipfragok)
                          * itself out.
                          */
                         security_sk_classify_flow(sk, &fl);
-                        if (ip_route_output_flow(&init_net, &rt, &fl, sk, 0))
+                        if (ip_route_output_flow(sock_net(sk), &rt, &fl, sk, 0))
                                 goto no_route;
                 }
                 sk_setup_caps(sk, &rt->u.dst);
@@ -441,7 +441,7 @@ int ip_fragment(struct sk_buff *skb, int (*output)(struct sk_buff*))
         unsigned int mtu, hlen, left, len, ll_rs, pad;
         int offset;
         __be16 not_last_frag;
-        struct rtable *rt = (struct rtable*)skb->dst;
+        struct rtable *rt = skb->rtable;
         int err = 0;
 
         dev = rt->u.dst.dev;
@@ -825,7 +825,7 @@ int ip_append_data(struct sock *sk,
                 inet->cork.fragsize = mtu = inet->pmtudisc == IP_PMTUDISC_PROBE ?
                                             rt->u.dst.dev->mtu :
                                             dst_mtu(rt->u.dst.path);
-                inet->cork.rt = rt;
+                inet->cork.dst = &rt->u.dst;
                 inet->cork.length = 0;
                 sk->sk_sndmsg_page = NULL;
                 sk->sk_sndmsg_off = 0;
@@ -834,7 +834,7 @@ int ip_append_data(struct sock *sk,
                         transhdrlen += exthdrlen;
                 }
         } else {
-                rt = inet->cork.rt;
+                rt = (struct rtable *)inet->cork.dst;
                 if (inet->cork.flags & IPCORK_OPT)
                         opt = inet->cork.opt;
 
@@ -1083,7 +1083,7 @@ ssize_t	ip_append_page(struct sock *sk, struct page *page,
         if (skb_queue_empty(&sk->sk_write_queue))
                 return -EINVAL;
 
-        rt = inet->cork.rt;
+        rt = (struct rtable *)inet->cork.dst;
         if (inet->cork.flags & IPCORK_OPT)
                 opt = inet->cork.opt;
 
@@ -1208,10 +1208,8 @@ static void ip_cork_release(struct inet_sock *inet)
         inet->cork.flags &= ~IPCORK_OPT;
         kfree(inet->cork.opt);
         inet->cork.opt = NULL;
-        if (inet->cork.rt) {
-                ip_rt_put(inet->cork.rt);
-                inet->cork.rt = NULL;
-        }
+        dst_release(inet->cork.dst);
+        inet->cork.dst = NULL;
 }
 
 /*
@@ -1224,7 +1222,7 @@ int ip_push_pending_frames(struct sock *sk)
         struct sk_buff **tail_skb;
         struct inet_sock *inet = inet_sk(sk);
         struct ip_options *opt = NULL;
-        struct rtable *rt = inet->cork.rt;
+        struct rtable *rt = (struct rtable *)inet->cork.dst;
         struct iphdr *iph;
         __be16 df = 0;
         __u8 ttl;
@@ -1357,7 +1355,7 @@ void ip_send_reply(struct sock *sk, struct sk_buff *skb, struct ip_reply_arg *ar
         } replyopts;
         struct ipcm_cookie ipc;
         __be32 daddr;
-        struct rtable *rt = (struct rtable*)skb->dst;
+        struct rtable *rt = skb->rtable;
 
         if (ip_options_echo(&replyopts.opt, skb))
                 return;
@@ -1384,7 +1382,7 @@ void ip_send_reply(struct sock *sk, struct sk_buff *skb, struct ip_reply_arg *ar
                                                  .dport = tcp_hdr(skb)->source } },
                                     .proto = sk->sk_protocol };
                 security_skb_classify_flow(skb, &fl);
-                if (ip_route_output_key(sk->sk_net, &rt, &fl))
+                if (ip_route_output_key(sock_net(sk), &rt, &fl))
                         return;
         }