1 files changed, 6 insertions, 4 deletions

diff --git a/net/decnet/af_decnet.c b/net/decnet/af_decnet.c
index 307c322d53bb..c4a2def5b7bd 100644
--- a/net/decnet/af_decnet.c
+++ b/net/decnet/af_decnet.c
@@ -909,6 +909,7 @@ static int __dn_connect(struct sock *sk, struct sockaddr_dn *addr, int addrlen,
         struct dn_scp *scp = DN_SK(sk);
         int err = -EISCONN;
         struct flowidn fld;
+        struct dst_entry *dst;
 
         if (sock->state == SS_CONNECTED)
                 goto out;
@@ -955,10 +956,11 @@ static int __dn_connect(struct sock *sk, struct sockaddr_dn *addr, int addrlen,
         fld.flowidn_proto = DNPROTO_NSP;
         if (dn_route_output_sock(&sk->sk_dst_cache, &fld, sk, flags) < 0)
                 goto out;
-        sk->sk_route_caps = sk->sk_dst_cache->dev->features;
+        dst = __sk_dst_get(sk);
+        sk->sk_route_caps = dst->dev->features;
         sock->state = SS_CONNECTING;
         scp->state = DN_CI;
-        scp->segsize_loc = dst_metric_advmss(sk->sk_dst_cache);
+        scp->segsize_loc = dst_metric_advmss(dst);
 
         dn_nsp_send_conninit(sk, NSP_CI);
         err = -EINPROGRESS;
@@ -2382,7 +2384,7 @@ static int __init decnet_init(void)
         dev_add_pack(&dn_dix_packet_type);
         register_netdevice_notifier(&dn_dev_notifier);
 
-        proc_net_fops_create(&init_net, "decnet", S_IRUGO, &dn_socket_seq_fops);
+        proc_create("decnet", S_IRUGO, init_net.proc_net, &dn_socket_seq_fops);
         dn_register_sysctl();
 out:
         return rc;
@@ -2411,7 +2413,7 @@ static void __exit decnet_exit(void)
         dn_neigh_cleanup();
         dn_fib_cleanup();
 
-        proc_net_remove(&init_net, "decnet");
+        remove_proc_entry("decnet", init_net.proc_net);
 
         proto_unregister(&dn_proto);