1 files changed, 5 insertions, 9 deletions

diff --git a/net/decnet/dn_nsp_out.c b/net/decnet/dn_nsp_out.c
index 2013c25b7f5a..a65e929ce76c 100644
--- a/net/decnet/dn_nsp_out.c
+++ b/net/decnet/dn_nsp_out.c
@@ -85,7 +85,7 @@ static void dn_nsp_send(struct sk_buff *skb)
         dst = sk_dst_check(sk, 0);
         if (dst) {
 try_again:
-                skb->dst = dst;
+                skb_dst_set(skb, dst);
                 dst_output(skb);
                 return;
         }
@@ -382,7 +382,7 @@ int dn_nsp_check_xmit_queue(struct sock *sk, struct sk_buff *skb, struct sk_buff
 {
         struct dn_skb_cb *cb = DN_SKB_CB(skb);
         struct dn_scp *scp = DN_SK(sk);
-        struct sk_buff *skb2, *list, *ack = NULL;
+        struct sk_buff *skb2, *n, *ack = NULL;
         int wakeup = 0;
         int try_retrans = 0;
         unsigned long reftime = cb->stamp;
@@ -390,9 +390,7 @@ int dn_nsp_check_xmit_queue(struct sock *sk, struct sk_buff *skb, struct sk_buff
         unsigned short xmit_count;
         unsigned short segnum;
 
-        skb2 = q->next;
-        list = (struct sk_buff *)q;
-        while(list != skb2) {
+        skb_queue_walk_safe(q, skb2, n) {
                 struct dn_skb_cb *cb2 = DN_SKB_CB(skb2);
 
                 if (dn_before_or_equal(cb2->segnum, acknum))
@@ -400,8 +398,6 @@ int dn_nsp_check_xmit_queue(struct sock *sk, struct sk_buff *skb, struct sk_buff
 
                 /* printk(KERN_DEBUG "ack: %s %04x %04x\n", ack ? "ACK" : "SKIP", (int)cb2->segnum, (int)acknum); */
 
-                skb2 = skb2->next;
-
                 if (ack == NULL)
                         continue;
 
@@ -586,7 +582,7 @@ static __inline__ void dn_nsp_do_disc(struct sock *sk, unsigned char msgflg,
          * to be able to send disc packets out which have no socket
          * associations.
          */
-        skb->dst = dst_clone(dst);
+        skb_dst_set(skb, dst_clone(dst));
         dst_output(skb);
 }
 
@@ -615,7 +611,7 @@ void dn_nsp_return_disc(struct sk_buff *skb, unsigned char msgflg,
         int ddl = 0;
         gfp_t gfp = GFP_ATOMIC;
 
-        dn_nsp_do_disc(NULL, msgflg, reason, gfp, skb->dst, ddl,
+        dn_nsp_do_disc(NULL, msgflg, reason, gfp, skb_dst(skb), ddl,
                         NULL, cb->src_port, cb->dst_port);
 }