2 files changed, 11 insertions, 16 deletions

diff --git a/net/decnet/dn_route.c b/net/decnet/dn_route.c
index a77d16158eb6..94f4ec036669 100644
--- a/net/decnet/dn_route.c
+++ b/net/decnet/dn_route.c
@@ -112,7 +112,7 @@ static unsigned long dn_rt_deadline;
 static int dn_dst_gc(struct dst_ops *ops);
 static struct dst_entry *dn_dst_check(struct dst_entry *, __u32);
 static unsigned int dn_dst_default_advmss(const struct dst_entry *dst);
-static unsigned int dn_dst_default_mtu(const struct dst_entry *dst);
+static unsigned int dn_dst_mtu(const struct dst_entry *dst);
 static void dn_dst_destroy(struct dst_entry *);
 static struct dst_entry *dn_dst_negative_advice(struct dst_entry *);
 static void dn_dst_link_failure(struct sk_buff *);
@@ -135,7 +135,7 @@ static struct dst_ops dn_dst_ops = {
         .gc =                   dn_dst_gc,
         .check =                dn_dst_check,
         .default_advmss =       dn_dst_default_advmss,
-        .default_mtu =          dn_dst_default_mtu,
+        .mtu =                  dn_dst_mtu,
         .cow_metrics =          dst_cow_metrics_generic,
         .destroy =              dn_dst_destroy,
         .negative_advice =      dn_dst_negative_advice,
@@ -825,9 +825,11 @@ static unsigned int dn_dst_default_advmss(const struct dst_entry *dst)
         return dn_mss_from_pmtu(dst->dev, dst_mtu(dst));
 }
 
-static unsigned int dn_dst_default_mtu(const struct dst_entry *dst)
+static unsigned int dn_dst_mtu(const struct dst_entry *dst)
 {
-        return dst->dev->mtu;
+        unsigned int mtu = dst_metric_raw(dst, RTAX_MTU);
+
+        return mtu ? : dst->dev->mtu;
 }
 
 static struct neighbour *dn_dst_neigh_lookup(const struct dst_entry *dst, const void *daddr)
diff --git a/net/decnet/dn_timer.c b/net/decnet/dn_timer.c
index 67f691bd4acf..d9c150cc59a9 100644
--- a/net/decnet/dn_timer.c
+++ b/net/decnet/dn_timer.c
@@ -36,16 +36,13 @@ static void dn_slow_timer(unsigned long arg);
 
 void dn_start_slow_timer(struct sock *sk)
 {
-        sk->sk_timer.expires    = jiffies + SLOW_INTERVAL;
-        sk->sk_timer.function   = dn_slow_timer;
-        sk->sk_timer.data       = (unsigned long)sk;
-
-        add_timer(&sk->sk_timer);
+        setup_timer(&sk->sk_timer, dn_slow_timer, (unsigned long)sk);
+        sk_reset_timer(sk, &sk->sk_timer, jiffies + SLOW_INTERVAL);
 }
 
 void dn_stop_slow_timer(struct sock *sk)
 {
-        del_timer(&sk->sk_timer);
+        sk_stop_timer(sk, &sk->sk_timer);
 }
 
 static void dn_slow_timer(unsigned long arg)
@@ -53,12 +50,10 @@ static void dn_slow_timer(unsigned long arg)
         struct sock *sk = (struct sock *)arg;
         struct dn_scp *scp = DN_SK(sk);
 
-        sock_hold(sk);
         bh_lock_sock(sk);
 
         if (sock_owned_by_user(sk)) {
-                sk->sk_timer.expires = jiffies + HZ / 10;
-                add_timer(&sk->sk_timer);
+                sk_reset_timer(sk, &sk->sk_timer, jiffies + HZ / 10);
                 goto out;
         }
 
@@ -100,9 +95,7 @@ static void dn_slow_timer(unsigned long arg)
                         scp->keepalive_fxn(sk);
         }
 
-        sk->sk_timer.expires = jiffies + SLOW_INTERVAL;
-
-        add_timer(&sk->sk_timer);
+        sk_reset_timer(sk, &sk->sk_timer, jiffies + SLOW_INTERVAL);
 out:
         bh_unlock_sock(sk);
         sock_put(sk);