1 files changed, 2 insertions, 6 deletions

diff --git a/net/decnet/dn_route.c b/net/decnet/dn_route.c
index c754670b7fca..0cc4394117df 100644
--- a/net/decnet/dn_route.c
+++ b/net/decnet/dn_route.c
@@ -124,7 +124,7 @@ int decnet_dst_gc_interval = 2;
 
 static struct dst_ops dn_dst_ops = {
         .family =               PF_DECnet,
-        .protocol =             __constant_htons(ETH_P_DNA_RT),
+        .protocol =             cpu_to_be16(ETH_P_DNA_RT),
         .gc_thresh =            128,
         .gc =                   dn_dst_gc,
         .check =                dn_dst_check,
@@ -380,7 +380,6 @@ static int dn_return_short(struct sk_buff *skb)
         unsigned char *ptr;
         __le16 *src;
         __le16 *dst;
-        __le16 tmp;
 
         /* Add back headers */
         skb_push(skb, skb->data - skb_network_header(skb));
@@ -399,10 +398,7 @@ static int dn_return_short(struct sk_buff *skb)
         ptr += 2;
         *ptr = 0; /* Zero hop count */
 
-        /* Swap source and destination */
-        tmp  = *src;
-        *src = *dst;
-        *dst = tmp;
+        swap(*src, *dst);
 
         skb->pkt_type = PACKET_OUTGOING;
         dn_rt_finish_output(skb, NULL, NULL);