[DECnet]: Endian annotation and fixes for DECnet.

The typedef for dn_address has been removed in favour of using __le16
or __u16 directly as appropriate. All the DECnet header files are
updated accordingly.

The byte ordering of dn_eth2dn() and dn_dn2eth() are both changed
since just about all their callers wanted network order rather than
host order, so the conversion is now done in the functions themselves.

Several missed endianess conversions have been picked up during the
conversion process. The nh_gw field in struct dn_fib_info has been
changed from a 32 bit field to 16 bits as it ought to be.

One or two cases of using htons rather than dn_htons in the routing
code have been found and fixed.

There are still a few warnings to fix, but this patch deals with the
important cases.

Signed-off-by: Steven Whitehouse <steve@chygwyn.com>
Signed-off-by: Patrick Caulfield <patrick@tykepenguin.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

10 files changed, 125 insertions, 122 deletions

diff --git a/net/decnet/af_decnet.c b/net/decnet/af_decnet.c
index ce4aaf94860d..824981eed225 100644
--- a/net/decnet/af_decnet.c
+++ b/net/decnet/af_decnet.c
@@ -172,7 +172,7 @@ static struct hlist_head *dn_find_list(struct sock *sk)
 /* 
  * Valid ports are those greater than zero and not already in use.
  */
-static int check_port(unsigned short port)
+static int check_port(__le16 port)
 {
         struct sock *sk;
         struct hlist_node *node;
@@ -661,7 +661,7 @@ disc_reject:
         }
 }
 
-char *dn_addr2asc(dn_address addr, char *buf)
+char *dn_addr2asc(__u16 addr, char *buf)
 {
         unsigned short node, area;
 
@@ -801,7 +801,7 @@ static int dn_auto_bind(struct socket *sock)
         /* End of compatibility stuff */
 
         scp->addr.sdn_add.a_len = dn_htons(2);
-        rv = dn_dev_bind_default((dn_address *)scp->addr.sdn_add.a_addr);
+        rv = dn_dev_bind_default((__le16 *)scp->addr.sdn_add.a_addr);
         if (rv == 0) {
                 rv = dn_hash_sock(sk);
                 if (rv)
@@ -1021,7 +1021,7 @@ static void dn_user_copy(struct sk_buff *skb, struct optdata_dn *opt)
         opt->opt_optl   = *ptr++;
         opt->opt_status = 0;
         memcpy(opt->opt_data, ptr, opt->opt_optl);
-        skb_pull(skb, opt->opt_optl + 1);
+        skb_pull(skb, dn_ntohs(opt->opt_optl) + 1);
 
 }
 
@@ -1121,8 +1121,8 @@ static int dn_accept(struct socket *sock, struct socket *newsock, int flags)
 
         skb_pull(skb, dn_username2sockaddr(skb->data, skb->len, &(DN_SK(newsk)->addr), &type));
         skb_pull(skb, dn_username2sockaddr(skb->data, skb->len, &(DN_SK(newsk)->peer), &type));
-        *(dn_address *)(DN_SK(newsk)->peer.sdn_add.a_addr) = cb->src;
-        *(dn_address *)(DN_SK(newsk)->addr.sdn_add.a_addr) = cb->dst;
+        *(__le16 *)(DN_SK(newsk)->peer.sdn_add.a_addr) = cb->src;
+        *(__le16 *)(DN_SK(newsk)->addr.sdn_add.a_addr) = cb->dst;
 
         menuver = *skb->data;
         skb_pull(skb, 1);
@@ -1365,7 +1365,7 @@ static int __dn_setsockopt(struct socket *sock, int level,int optname, char __us
                         if (optlen != sizeof(struct optdata_dn))
                                 return -EINVAL;
 
-                        if (u.opt.opt_optl > 16)
+                        if (dn_ntohs(u.opt.opt_optl) > 16)
                                 return -EINVAL;
 
                         memcpy(&scp->conndata_out, &u.opt, optlen);
@@ -1378,7 +1378,7 @@ static int __dn_setsockopt(struct socket *sock, int level,int optname, char __us
                         if (optlen != sizeof(struct optdata_dn))
                                 return -EINVAL;
 
-                        if (u.opt.opt_optl > 16)
+                        if (dn_ntohs(u.opt.opt_optl) > 16)
                                 return -EINVAL;
 
                         memcpy(&scp->discdata_out, &u.opt, optlen);
diff --git a/net/decnet/dn_dev.c b/net/decnet/dn_dev.c
index efbead83ba7f..cc7b9d9255ef 100644
--- a/net/decnet/dn_dev.c
+++ b/net/decnet/dn_dev.c
@@ -64,7 +64,7 @@ extern struct neigh_table dn_neigh_table;
 /*
  * decnet_address is kept in network order.
  */
-dn_address decnet_address = 0;
+__le16 decnet_address = 0;
 
 static DEFINE_RWLOCK(dndev_lock);
 static struct net_device *decnet_default_device;
@@ -439,7 +439,7 @@ static void dn_dev_del_ifa(struct dn_dev *dn_db, struct dn_ifaddr **ifap, int de
         *ifap = ifa1->ifa_next;
 
         if (dn_db->dev->type == ARPHRD_ETHER) {
-                if (ifa1->ifa_local != dn_htons(dn_eth2dn(dev->dev_addr))) {
+                if (ifa1->ifa_local != dn_eth2dn(dev->dev_addr)) {
                         dn_dn2eth(mac_addr, ifa1->ifa_local);
                         dev_mc_delete(dev, mac_addr, ETH_ALEN, 0);
                 }
@@ -470,7 +470,7 @@ static int dn_dev_insert_ifa(struct dn_dev *dn_db, struct dn_ifaddr *ifa)
         }
 
         if (dev->type == ARPHRD_ETHER) {
-                if (ifa->ifa_local != dn_htons(dn_eth2dn(dev->dev_addr))) {
+                if (ifa->ifa_local != dn_eth2dn(dev->dev_addr)) {
                         dn_dn2eth(mac_addr, ifa->ifa_local);
                         dev_mc_add(dev, mac_addr, ETH_ALEN, 0);
                         dev_mc_upload(dev);
@@ -561,7 +561,7 @@ int dn_dev_ioctl(unsigned int cmd, void __user *arg)
 
         switch(cmd) {
                 case SIOCGIFADDR:
-                        *((dn_address *)sdn->sdn_nodeaddr) = ifa->ifa_local;
+                        *((__le16 *)sdn->sdn_nodeaddr) = ifa->ifa_local;
                         goto rarok;
 
                 case SIOCSIFADDR:
@@ -804,7 +804,7 @@ done:
         return skb->len;
 }
 
-static int dn_dev_get_first(struct net_device *dev, dn_address *addr)
+static int dn_dev_get_first(struct net_device *dev, __le16 *addr)
 {
         struct dn_dev *dn_db = (struct dn_dev *)dev->dn_ptr;
         struct dn_ifaddr *ifa;
@@ -830,7 +830,7 @@ out:
  * a sensible default. Eventually the routing code will take care of all the
  * nasties for us I hope.
  */
-int dn_dev_bind_default(dn_address *addr)
+int dn_dev_bind_default(__le16 *addr)
 {
         struct net_device *dev;
         int rv;
@@ -853,7 +853,7 @@ static void dn_send_endnode_hello(struct net_device *dev, struct dn_ifaddr *ifa)
 {
         struct endnode_hello_message *msg;
         struct sk_buff *skb = NULL;
-        unsigned short int *pktlen;
+        __le16 *pktlen;
         struct dn_dev *dn_db = (struct dn_dev *)dev->dn_ptr;
 
         if ((skb = dn_alloc_skb(NULL, sizeof(*msg), GFP_ATOMIC)) == NULL)
@@ -882,7 +882,7 @@ static void dn_send_endnode_hello(struct net_device *dev, struct dn_ifaddr *ifa)
         msg->datalen = 0x02;
         memset(msg->data, 0xAA, 2);
         
-        pktlen = (unsigned short *)skb_push(skb,2);
+        pktlen = (__le16 *)skb_push(skb,2);
         *pktlen = dn_htons(skb->len - 2);
 
         skb->nh.raw = skb->data;
@@ -926,7 +926,7 @@ static void dn_send_router_hello(struct net_device *dev, struct dn_ifaddr *ifa)
         size_t size;
         unsigned char *ptr;
         unsigned char *i1, *i2;
-        unsigned short *pktlen;
+        __le16 *pktlen;
         char *src;
 
         if (mtu2blksize(dev) < (26 + 7))
@@ -955,11 +955,11 @@ static void dn_send_router_hello(struct net_device *dev, struct dn_ifaddr *ifa)
         ptr += ETH_ALEN;
         *ptr++ = dn_db->parms.forwarding == 1 ? 
                         DN_RT_INFO_L1RT : DN_RT_INFO_L2RT;
-        *((unsigned short *)ptr) = dn_htons(mtu2blksize(dev));
+        *((__le16 *)ptr) = dn_htons(mtu2blksize(dev));
         ptr += 2;
         *ptr++ = dn_db->parms.priority; /* Priority */ 
         *ptr++ = 0; /* Area: Reserved */
-        *((unsigned short *)ptr) = dn_htons((unsigned short)dn_db->parms.t3);
+        *((__le16 *)ptr) = dn_htons((unsigned short)dn_db->parms.t3);
         ptr += 2;
         *ptr++ = 0; /* MPD: Reserved */
         i1 = ptr++;
@@ -974,7 +974,7 @@ static void dn_send_router_hello(struct net_device *dev, struct dn_ifaddr *ifa)
 
         skb_trim(skb, (27 + *i2));
 
-        pktlen = (unsigned short *)skb_push(skb, 2);
+        pktlen = (__le16 *)skb_push(skb, 2);
         *pktlen = dn_htons(skb->len - 2);
 
         skb->nh.raw = skb->data;
@@ -1016,7 +1016,7 @@ static void dn_send_ptp_hello(struct net_device *dev, struct dn_ifaddr *ifa)
         ptr = skb_put(skb, 2 + 4 + tdlen);
 
         *ptr++ = DN_RT_PKT_HELO;
-        *((dn_address *)ptr) = ifa->ifa_local;
+        *((__le16 *)ptr) = ifa->ifa_local;
         ptr += 2;
         *ptr++ = tdlen;
 
@@ -1150,7 +1150,7 @@ struct dn_dev *dn_dev_create(struct net_device *dev, int *err)
 void dn_dev_up(struct net_device *dev)
 {
         struct dn_ifaddr *ifa;
-        dn_address addr = decnet_address;
+        __le16 addr = decnet_address;
         int maybe_default = 0;
         struct dn_dev *dn_db = (struct dn_dev *)dev->dn_ptr;
 
@@ -1173,7 +1173,7 @@ void dn_dev_up(struct net_device *dev)
         if (dev->type == ARPHRD_ETHER) {
                 if (memcmp(dev->dev_addr, dn_hiord, 4) != 0)
                         return;
-                addr = dn_htons(dn_eth2dn(dev->dev_addr));
+                addr = dn_eth2dn(dev->dev_addr);
                 maybe_default = 1;
         }
 
@@ -1385,8 +1385,8 @@ static int dn_dev_seq_show(struct seq_file *seq, void *v)
                                 mtu2blksize(dev),
                                 dn_db->parms.priority,
                                 dn_db->parms.state, dn_db->parms.name,
-                                dn_db->router ? dn_addr2asc(dn_ntohs(*(dn_address *)dn_db->router->primary_key), router_buf) : "",
-                                dn_db->peer ? dn_addr2asc(dn_ntohs(*(dn_address *)dn_db->peer->primary_key), peer_buf) : "");
+                                dn_db->router ? dn_addr2asc(dn_ntohs(*(__le16 *)dn_db->router->primary_key), router_buf) : "",
+                                dn_db->peer ? dn_addr2asc(dn_ntohs(*(__le16 *)dn_db->peer->primary_key), peer_buf) : "");
         }
         return 0;
 }
diff --git a/net/decnet/dn_fib.c b/net/decnet/dn_fib.c
index 99bc061759c3..bd4ce8681a12 100644
--- a/net/decnet/dn_fib.c
+++ b/net/decnet/dn_fib.c
@@ -143,11 +143,11 @@ static inline struct dn_fib_info *dn_fib_find_info(const struct dn_fib_info *nfi
         return NULL;
 }
 
-u16 dn_fib_get_attr16(struct rtattr *attr, int attrlen, int type)
+__le16 dn_fib_get_attr16(struct rtattr *attr, int attrlen, int type)
 {
         while(RTA_OK(attr,attrlen)) {
                 if (attr->rta_type == type)
-                        return *(u16*)RTA_DATA(attr);
+                        return *(__le16*)RTA_DATA(attr);
                 attr = RTA_NEXT(attr, attrlen);
         }
 
@@ -565,7 +565,7 @@ int dn_fib_dump(struct sk_buff *skb, struct netlink_callback *cb)
         return skb->len;
 }
 
-static void fib_magic(int cmd, int type, __u16 dst, int dst_len, struct dn_ifaddr *ifa)
+static void fib_magic(int cmd, int type, __le16 dst, int dst_len, struct dn_ifaddr *ifa)
 {
         struct dn_fib_table *tb;
         struct {
@@ -684,7 +684,7 @@ static int dn_fib_dnaddr_event(struct notifier_block *this, unsigned long event,
         return NOTIFY_DONE;
 }
 
-int dn_fib_sync_down(dn_address local, struct net_device *dev, int force)
+int dn_fib_sync_down(__le16 local, struct net_device *dev, int force)
 {
         int ret = 0;
         int scope = RT_SCOPE_NOWHERE;
diff --git a/net/decnet/dn_neigh.c b/net/decnet/dn_neigh.c
index 33ab256cfd4a..7c8692c26bfe 100644
--- a/net/decnet/dn_neigh.c
+++ b/net/decnet/dn_neigh.c
@@ -95,7 +95,7 @@ static struct neigh_ops dn_phase3_ops = {
 struct neigh_table dn_neigh_table = {
         .family =                       PF_DECnet,
         .entry_size =                   sizeof(struct dn_neigh),
-        .key_len =                      sizeof(dn_address),
+        .key_len =                      sizeof(__le16),
         .hash =                         dn_neigh_hash,
         .constructor =                  dn_neigh_construct,
         .id =                           "dn_neigh_cache",
@@ -123,7 +123,7 @@ struct neigh_table dn_neigh_table = {
 
 static u32 dn_neigh_hash(const void *pkey, const struct net_device *dev)
 {
-        return jhash_2words(*(dn_address *)pkey, 0, dn_neigh_table.hash_rnd);
+        return jhash_2words(*(__u16 *)pkey, 0, dn_neigh_table.hash_rnd);
 }
 
 static int dn_neigh_construct(struct neighbour *neigh)
@@ -249,14 +249,14 @@ static int dn_long_output(struct sk_buff *skb)
         data = skb_push(skb, sizeof(struct dn_long_packet) + 3);
         lp = (struct dn_long_packet *)(data+3);
 
-        *((unsigned short *)data) = dn_htons(skb->len - 2);
+        *((__le16 *)data) = dn_htons(skb->len - 2);
         *(data + 2) = 1 | DN_RT_F_PF; /* Padding */
 
         lp->msgflg   = DN_RT_PKT_LONG|(cb->rt_flags&(DN_RT_F_IE|DN_RT_F_RQR|DN_RT_F_RTS));
         lp->d_area   = lp->d_subarea = 0;
-        dn_dn2eth(lp->d_id, dn_ntohs(cb->dst));
+        dn_dn2eth(lp->d_id, cb->dst);
         lp->s_area   = lp->s_subarea = 0;
-        dn_dn2eth(lp->s_id, dn_ntohs(cb->src));
+        dn_dn2eth(lp->s_id, cb->src);
         lp->nl2      = 0;
         lp->visit_ct = cb->hops & 0x3f;
         lp->s_class  = 0;
@@ -293,7 +293,7 @@ static int dn_short_output(struct sk_buff *skb)
         }
 
         data = skb_push(skb, sizeof(struct dn_short_packet) + 2);
-        *((unsigned short *)data) = dn_htons(skb->len - 2);
+        *((__le16 *)data) = dn_htons(skb->len - 2);
         sp = (struct dn_short_packet *)(data+2);
 
         sp->msgflg     = DN_RT_PKT_SHORT|(cb->rt_flags&(DN_RT_F_RQR|DN_RT_F_RTS));
@@ -335,7 +335,7 @@ static int dn_phase3_output(struct sk_buff *skb)
         }
 
         data = skb_push(skb, sizeof(struct dn_short_packet) + 2);
-        *((unsigned short *)data) = dn_htons(skb->len - 2);
+        *((__le16 *)data) = dn_htons(skb->len - 2);
         sp = (struct dn_short_packet *)(data + 2);
 
         sp->msgflg   = DN_RT_PKT_SHORT|(cb->rt_flags&(DN_RT_F_RQR|DN_RT_F_RTS));
@@ -373,9 +373,9 @@ int dn_neigh_router_hello(struct sk_buff *skb)
         struct neighbour *neigh;
         struct dn_neigh *dn;
         struct dn_dev *dn_db;
-        dn_address src;
+        __le16 src;
 
-        src = dn_htons(dn_eth2dn(msg->id));
+        src = dn_eth2dn(msg->id);
 
         neigh = __neigh_lookup(&dn_neigh_table, &src, skb->dev, 1);
 
@@ -409,7 +409,7 @@ int dn_neigh_router_hello(struct sk_buff *skb)
                 }
 
                 /* Only use routers in our area */
-                if ((dn_ntohs(src)>>10) == dn_ntohs((decnet_address)>>10)) {
+                if ((dn_ntohs(src)>>10) == (dn_ntohs((decnet_address))>>10)) {
                         if (!dn_db->router) {
                                 dn_db->router = neigh_clone(neigh);
                         } else {
@@ -433,9 +433,9 @@ int dn_neigh_endnode_hello(struct sk_buff *skb)
         struct endnode_hello_message *msg = (struct endnode_hello_message *)skb->data;
         struct neighbour *neigh;
         struct dn_neigh *dn;
-        dn_address src;
+        __le16 src;
 
-        src = dn_htons(dn_eth2dn(msg->id));
+        src = dn_eth2dn(msg->id);
 
         neigh = __neigh_lookup(&dn_neigh_table, &src, skb->dev, 1);
 
diff --git a/net/decnet/dn_nsp_in.c b/net/decnet/dn_nsp_in.c
index 44bda85e678f..547523b41c81 100644
--- a/net/decnet/dn_nsp_in.c
+++ b/net/decnet/dn_nsp_in.c
@@ -85,7 +85,7 @@ static void dn_log_martian(struct sk_buff *skb, const char *msg)
         if (decnet_log_martians && net_ratelimit()) {
                 char *devname = skb->dev ? skb->dev->name : "???";
                 struct dn_skb_cb *cb = DN_SKB_CB(skb);
-                printk(KERN_INFO "DECnet: Martian packet (%s) dev=%s src=0x%04hx dst=0x%04hx srcport=0x%04hx dstport=0x%04hx\n", msg, devname, cb->src, cb->dst, cb->src_port, cb->dst_port);
+                printk(KERN_INFO "DECnet: Martian packet (%s) dev=%s src=0x%04hx dst=0x%04hx srcport=0x%04hx dstport=0x%04hx\n", msg, devname, dn_ntohs(cb->src), dn_ntohs(cb->dst), dn_ntohs(cb->src_port), dn_ntohs(cb->dst_port));
         }
 }
 
@@ -128,7 +128,7 @@ static void dn_ack(struct sock *sk, struct sk_buff *skb, unsigned short ack)
  */
 static int dn_process_ack(struct sock *sk, struct sk_buff *skb, int oth)
 {
-        unsigned short *ptr = (unsigned short *)skb->data;
+        __le16 *ptr = (__le16 *)skb->data;
         int len = 0;
         unsigned short ack;
 
@@ -346,7 +346,7 @@ static void dn_nsp_conn_conf(struct sock *sk, struct sk_buff *skb)
         ptr = skb->data;
         cb->services = *ptr++;
         cb->info = *ptr++;
-        cb->segsize = dn_ntohs(*(__u16 *)ptr);
+        cb->segsize = dn_ntohs(*(__le16 *)ptr);
 
         if ((scp->state == DN_CI) || (scp->state == DN_CD)) {
                 scp->persist = 0;
@@ -363,7 +363,7 @@ static void dn_nsp_conn_conf(struct sock *sk, struct sk_buff *skb)
                 if (skb->len > 0) {
                         unsigned char dlen = *skb->data;
                         if ((dlen <= 16) && (dlen <= skb->len)) {
-                                scp->conndata_in.opt_optl = dlen;
+                                scp->conndata_in.opt_optl = dn_htons((__u16)dlen);
                                 memcpy(scp->conndata_in.opt_data, skb->data + 1, dlen);
                         }
                 }
@@ -397,17 +397,17 @@ static void dn_nsp_disc_init(struct sock *sk, struct sk_buff *skb)
         if (skb->len < 2)
                 goto out;
 
-        reason = dn_ntohs(*(__u16 *)skb->data);
+        reason = dn_ntohs(*(__le16 *)skb->data);
         skb_pull(skb, 2);
 
-        scp->discdata_in.opt_status = reason;
+        scp->discdata_in.opt_status = dn_htons(reason);
         scp->discdata_in.opt_optl   = 0;
         memset(scp->discdata_in.opt_data, 0, 16);
 
         if (skb->len > 0) {
                 unsigned char dlen = *skb->data;
                 if ((dlen <= 16) && (dlen <= skb->len)) {
-                        scp->discdata_in.opt_optl = dlen;
+                        scp->discdata_in.opt_optl = dn_htons((__u16)dlen);
                         memcpy(scp->discdata_in.opt_data, skb->data + 1, dlen);
                 }
         }
@@ -464,7 +464,7 @@ static void dn_nsp_disc_conf(struct sock *sk, struct sk_buff *skb)
         if (skb->len != 2)
                 goto out;
 
-        reason = dn_ntohs(*(__u16 *)skb->data);
+        reason = dn_ntohs(*(__le16 *)skb->data);
 
         sk->sk_state = TCP_CLOSE;
 
@@ -513,7 +513,7 @@ static void dn_nsp_linkservice(struct sock *sk, struct sk_buff *skb)
         if (skb->len != 4)
                 goto out;
 
-        segnum = dn_ntohs(*(__u16 *)ptr);
+        segnum = dn_ntohs(*(__le16 *)ptr);
         ptr += 2;
         lsflags = *(unsigned char *)ptr++;
         fcval = *ptr;
@@ -621,7 +621,7 @@ static void dn_nsp_otherdata(struct sock *sk, struct sk_buff *skb)
         if (skb->len < 2)
                 goto out;
 
-        cb->segnum = segnum = dn_ntohs(*(__u16 *)skb->data);
+        cb->segnum = segnum = dn_ntohs(*(__le16 *)skb->data);
         skb_pull(skb, 2);
 
         if (seq_next(scp->numoth_rcv, segnum)) {
@@ -649,7 +649,7 @@ static void dn_nsp_data(struct sock *sk, struct sk_buff *skb)
         if (skb->len < 2)
                 goto out;
 
-        cb->segnum = segnum = dn_ntohs(*(__u16 *)skb->data);
+        cb->segnum = segnum = dn_ntohs(*(__le16 *)skb->data);
         skb_pull(skb, 2);
 
         if (seq_next(scp->numdat_rcv, segnum)) {
@@ -760,7 +760,7 @@ static int dn_nsp_rx_packet(struct sk_buff *skb)
         /*
          * Grab the destination address.
          */
-        cb->dst_port = *(unsigned short *)ptr;
+        cb->dst_port = *(__le16 *)ptr;
         cb->src_port = 0;
         ptr += 2;
 
@@ -768,7 +768,7 @@ static int dn_nsp_rx_packet(struct sk_buff *skb)
          * If not a connack, grab the source address too.
          */
         if (pskb_may_pull(skb, 5)) {
-                cb->src_port = *(unsigned short *)ptr;
+                cb->src_port = *(__le16 *)ptr;
                 ptr += 2;
                 skb_pull(skb, 5);
         }
@@ -778,7 +778,7 @@ static int dn_nsp_rx_packet(struct sk_buff *skb)
          * Swap src & dst and look up in the normal way.
          */
         if (unlikely(cb->rt_flags & DN_RT_F_RTS)) {
-                unsigned short tmp = cb->dst_port;
+                __le16 tmp = cb->dst_port;
                 cb->dst_port = cb->src_port;
                 cb->src_port = tmp;
                 tmp = cb->dst;
diff --git a/net/decnet/dn_nsp_out.c b/net/decnet/dn_nsp_out.c
index c96c767b1f74..c2e21cd89b3c 100644
--- a/net/decnet/dn_nsp_out.c
+++ b/net/decnet/dn_nsp_out.c
@@ -287,26 +287,26 @@ int dn_nsp_xmit_timeout(struct sock *sk)
         return 0;
 }
 
-static inline unsigned char *dn_mk_common_header(struct dn_scp *scp, struct sk_buff *skb, unsigned char msgflag, int len)
+static inline __le16 *dn_mk_common_header(struct dn_scp *scp, struct sk_buff *skb, unsigned char msgflag, int len)
 {
         unsigned char *ptr = skb_push(skb, len);
 
         BUG_ON(len < 5);
 
         *ptr++ = msgflag;
-        *((unsigned short *)ptr) = scp->addrrem;
+        *((__le16 *)ptr) = scp->addrrem;
         ptr += 2;
-        *((unsigned short *)ptr) = scp->addrloc;
+        *((__le16 *)ptr) = scp->addrloc;
         ptr += 2;
-        return ptr;
+        return (__le16 __force *)ptr;
 }
 
-static unsigned short *dn_mk_ack_header(struct sock *sk, struct sk_buff *skb, unsigned char msgflag, int hlen, int other)
+static __le16 *dn_mk_ack_header(struct sock *sk, struct sk_buff *skb, unsigned char msgflag, int hlen, int other)
 {
         struct dn_scp *scp = DN_SK(sk);
         unsigned short acknum = scp->numdat_rcv & 0x0FFF;
         unsigned short ackcrs = scp->numoth_rcv & 0x0FFF;
-        unsigned short *ptr;
+        __le16 *ptr;
 
         BUG_ON(hlen < 9);
 
@@ -325,7 +325,7 @@ static unsigned short *dn_mk_ack_header(struct sock *sk, struct sk_buff *skb, un
         /* Set "cross subchannel" bit in ackcrs */
         ackcrs |= 0x2000;
 
-        ptr = (unsigned short *)dn_mk_common_header(scp, skb, msgflag, hlen);
+        ptr = (__le16 *)dn_mk_common_header(scp, skb, msgflag, hlen);
 
         *ptr++ = dn_htons(acknum);
         *ptr++ = dn_htons(ackcrs);
@@ -333,11 +333,11 @@ static unsigned short *dn_mk_ack_header(struct sock *sk, struct sk_buff *skb, un
         return ptr;
 }
 
-static unsigned short *dn_nsp_mk_data_header(struct sock *sk, struct sk_buff *skb, int oth)
+static __le16 *dn_nsp_mk_data_header(struct sock *sk, struct sk_buff *skb, int oth)
 {
         struct dn_scp *scp = DN_SK(sk);
         struct dn_skb_cb *cb = DN_SKB_CB(skb);
-        unsigned short *ptr = dn_mk_ack_header(sk, skb, cb->nsp_flags, 11, oth);
+        __le16 *ptr = dn_mk_ack_header(sk, skb, cb->nsp_flags, 11, oth);
 
         if (unlikely(oth)) {
                 cb->segnum = scp->numoth;
@@ -524,9 +524,9 @@ void dn_send_conn_conf(struct sock *sk, gfp_t gfp)
         struct dn_scp *scp = DN_SK(sk);
         struct sk_buff *skb = NULL;
         struct nsp_conn_init_msg *msg;
-        unsigned char len = scp->conndata_out.opt_optl;
+        __u8 len = (__u8)dn_ntohs(scp->conndata_out.opt_optl);
 
-        if ((skb = dn_alloc_skb(sk, 50 + scp->conndata_out.opt_optl, gfp)) == NULL)
+        if ((skb = dn_alloc_skb(sk, 50 + dn_ntohs(scp->conndata_out.opt_optl), gfp)) == NULL)
                 return;
 
         msg = (struct nsp_conn_init_msg *)skb_put(skb, sizeof(*msg));
@@ -553,7 +553,7 @@ void dn_send_conn_conf(struct sock *sk, gfp_t gfp)
 static __inline__ void dn_nsp_do_disc(struct sock *sk, unsigned char msgflg, 
                         unsigned short reason, gfp_t gfp,
                         struct dst_entry *dst,
-                        int ddl, unsigned char *dd, __u16 rem, __u16 loc)
+                        int ddl, unsigned char *dd, __le16 rem, __le16 loc)
 {
         struct sk_buff *skb = NULL;
         int size = 7 + ddl + ((msgflg == NSP_DISCINIT) ? 1 : 0);
@@ -561,7 +561,7 @@ static __inline__ void dn_nsp_do_disc(struct sock *sk, unsigned char msgflg,
 
         if ((dst == NULL) || (rem == 0)) {
                 if (net_ratelimit())
-                        printk(KERN_DEBUG "DECnet: dn_nsp_do_disc: BUG! Please report this to SteveW@ACM.org rem=%u dst=%p\n", (unsigned)rem, dst);
+                        printk(KERN_DEBUG "DECnet: dn_nsp_do_disc: BUG! Please report this to SteveW@ACM.org rem=%u dst=%p\n", dn_ntohs(rem), dst);
                 return;
         }
 
@@ -570,11 +570,11 @@ static __inline__ void dn_nsp_do_disc(struct sock *sk, unsigned char msgflg,
 
         msg = skb_put(skb, size);
         *msg++ = msgflg;
-        *(__u16 *)msg = rem;
+        *(__le16 *)msg = rem;
         msg += 2;
-        *(__u16 *)msg = loc;
+        *(__le16 *)msg = loc;
         msg += 2;
-        *(__u16 *)msg = dn_htons(reason);
+        *(__le16 *)msg = dn_htons(reason);
         msg += 2;
         if (msgflg == NSP_DISCINIT)
                 *msg++ = ddl;
@@ -600,10 +600,10 @@ void dn_nsp_send_disc(struct sock *sk, unsigned char msgflg,
         int ddl = 0;
 
         if (msgflg == NSP_DISCINIT)
-                ddl = scp->discdata_out.opt_optl;
+                ddl = dn_ntohs(scp->discdata_out.opt_optl);
 
         if (reason == 0)
-                reason = scp->discdata_out.opt_status;
+                reason = dn_ntohs(scp->discdata_out.opt_status);
 
         dn_nsp_do_disc(sk, msgflg, reason, gfp, sk->sk_dst_cache, ddl, 
                 scp->discdata_out.opt_data, scp->addrrem, scp->addrloc);
@@ -708,7 +708,7 @@ void dn_nsp_send_conninit(struct sock *sk, unsigned char msgflg)
         if (aux > 0)
         memcpy(skb_put(skb, aux), scp->accessdata.acc_acc, aux);
 
-        aux = scp->conndata_out.opt_optl;
+        aux = (__u8)dn_ntohs(scp->conndata_out.opt_optl);
         *skb_put(skb, 1) = aux;
         if (aux > 0)
         memcpy(skb_put(skb,aux), scp->conndata_out.opt_data, aux);
diff --git a/net/decnet/dn_route.c b/net/decnet/dn_route.c
index 3407f190afe8..d7037fe3cafe 100644
--- a/net/decnet/dn_route.c
+++ b/net/decnet/dn_route.c
@@ -133,9 +133,9 @@ static struct dst_ops dn_dst_ops = {
         .entries =              ATOMIC_INIT(0),
 };
 
-static __inline__ unsigned dn_hash(unsigned short src, unsigned short dst)
+static __inline__ unsigned dn_hash(__le16 src, __le16 dst)
 {
-        unsigned short tmp = src ^ dst;
+        __u16 tmp = (__u16 __force)(src ^ dst);
         tmp ^= (tmp >> 3);
         tmp ^= (tmp >> 5);
         tmp ^= (tmp >> 10);
@@ -379,9 +379,9 @@ static int dn_return_short(struct sk_buff *skb)
 {
         struct dn_skb_cb *cb;
         unsigned char *ptr;
-        dn_address *src;
-        dn_address *dst;
-        dn_address tmp;
+        __le16 *src;
+        __le16 *dst;
+        __le16 tmp;
 
         /* Add back headers */
         skb_push(skb, skb->data - skb->nh.raw);
@@ -394,9 +394,9 @@ static int dn_return_short(struct sk_buff *skb)
         ptr = skb->data + 2;
         *ptr++ = (cb->rt_flags & ~DN_RT_F_RQR) | DN_RT_F_RTS;
 
-        dst = (dn_address *)ptr;
+        dst = (__le16 *)ptr;
         ptr += 2;
-        src = (dn_address *)ptr;
+        src = (__le16 *)ptr;
         ptr += 2;
         *ptr = 0; /* Zero hop count */
 
@@ -475,7 +475,8 @@ static int dn_route_rx_packet(struct sk_buff *skb)
                 struct dn_skb_cb *cb = DN_SKB_CB(skb);
                 printk(KERN_DEBUG
                         "DECnet: dn_route_rx_packet: rt_flags=0x%02x dev=%s len=%d src=0x%04hx dst=0x%04hx err=%d type=%d\n",
-                        (int)cb->rt_flags, devname, skb->len, cb->src, cb->dst, 
+                        (int)cb->rt_flags, devname, skb->len,
+                        dn_ntohs(cb->src), dn_ntohs(cb->dst),
                         err, skb->pkt_type);
         }
 
@@ -505,7 +506,7 @@ static int dn_route_rx_long(struct sk_buff *skb)
 
         /* Destination info */
         ptr += 2;
-        cb->dst = dn_htons(dn_eth2dn(ptr));
+        cb->dst = dn_eth2dn(ptr);
         if (memcmp(ptr, dn_hiord_addr, 4) != 0)
                 goto drop_it;
         ptr += 6;
@@ -513,7 +514,7 @@ static int dn_route_rx_long(struct sk_buff *skb)
 
         /* Source info */
         ptr += 2;
-        cb->src = dn_htons(dn_eth2dn(ptr));
+        cb->src = dn_eth2dn(ptr);
         if (memcmp(ptr, dn_hiord_addr, 4) != 0)
                 goto drop_it;
         ptr += 6;
@@ -541,9 +542,9 @@ static int dn_route_rx_short(struct sk_buff *skb)
         skb_pull(skb, 5);
         skb->h.raw = skb->data;
 
-        cb->dst = *(dn_address *)ptr;
+        cb->dst = *(__le16 *)ptr;
         ptr += 2;
-        cb->src = *(dn_address *)ptr;
+        cb->src = *(__le16 *)ptr;
         ptr += 2;
         cb->hops = *ptr & 0x3f;
 
@@ -575,7 +576,7 @@ int dn_route_rcv(struct sk_buff *skb, struct net_device *dev, struct packet_type
 {
         struct dn_skb_cb *cb;
         unsigned char flags = 0;
-        __u16 len = dn_ntohs(*(__u16 *)skb->data);
+        __u16 len = dn_ntohs(*(__le16 *)skb->data);
         struct dn_dev *dn = (struct dn_dev *)dev->dn_ptr;
         unsigned char padlen = 0;
 
@@ -782,7 +783,7 @@ static int dn_rt_bug(struct sk_buff *skb)
                 struct dn_skb_cb *cb = DN_SKB_CB(skb);
 
                 printk(KERN_DEBUG "dn_rt_bug: skb from:%04x to:%04x\n",
-                                cb->src, cb->dst);
+                                dn_ntohs(cb->src), dn_ntohs(cb->dst));
         }
 
         kfree_skb(skb);
@@ -823,7 +824,7 @@ static int dn_rt_set_next_hop(struct dn_route *rt, struct dn_fib_res *res)
         return 0;
 }
 
-static inline int dn_match_addr(__u16 addr1, __u16 addr2)
+static inline int dn_match_addr(__le16 addr1, __le16 addr2)
 {
         __u16 tmp = dn_ntohs(addr1) ^ dn_ntohs(addr2);
         int match = 16;
@@ -834,9 +835,9 @@ static inline int dn_match_addr(__u16 addr1, __u16 addr2)
         return match;
 }
 
-static __u16 dnet_select_source(const struct net_device *dev, __u16 daddr, int scope)
+static __le16 dnet_select_source(const struct net_device *dev, __le16 daddr, int scope)
 {
-        __u16 saddr = 0;
+        __le16 saddr = 0;
         struct dn_dev *dn_db = dev->dn_ptr;
         struct dn_ifaddr *ifa;
         int best_match = 0;
@@ -861,14 +862,14 @@ static __u16 dnet_select_source(const struct net_device *dev, __u16 daddr, int s
         return saddr;
 }
 
-static inline __u16 __dn_fib_res_prefsrc(struct dn_fib_res *res)
+static inline __le16 __dn_fib_res_prefsrc(struct dn_fib_res *res)
 {
         return dnet_select_source(DN_FIB_RES_DEV(*res), DN_FIB_RES_GW(*res), res->scope);
 }
 
-static inline __u16 dn_fib_rules_map_destination(__u16 daddr, struct dn_fib_res *res)
+static inline __le16 dn_fib_rules_map_destination(__le16 daddr, struct dn_fib_res *res)
 {
-        __u16 mask = dnet_make_mask(res->prefixlen);
+        __le16 mask = dnet_make_mask(res->prefixlen);
         return (daddr&~mask)|res->fi->fib_nh->nh_gw;
 }
 
@@ -892,12 +893,13 @@ static int dn_route_output_slow(struct dst_entry **pprt, const struct flowi *old
         struct dn_fib_res res = { .fi = NULL, .type = RTN_UNICAST };
         int err;
         int free_res = 0;
-        __u16 gateway = 0;
+        __le16 gateway = 0;
 
         if (decnet_debug_level & 16)
                 printk(KERN_DEBUG
                        "dn_route_output_slow: dst=%04x src=%04x mark=%d"
-                       " iif=%d oif=%d\n", oldflp->fld_dst, oldflp->fld_src,
+                       " iif=%d oif=%d\n", dn_ntohs(oldflp->fld_dst),
+                       dn_ntohs(oldflp->fld_src),
                        oldflp->fld_fwmark, loopback_dev.ifindex, oldflp->oif);
 
         /* If we have an output interface, verify its a DECnet device */
@@ -961,8 +963,9 @@ source_ok:
         if (decnet_debug_level & 16)
                 printk(KERN_DEBUG
                        "dn_route_output_slow: initial checks complete."
-                       " dst=%o4x src=%04x oif=%d try_hard=%d\n", fl.fld_dst,
-                       fl.fld_src, fl.oif, try_hard);
+                       " dst=%o4x src=%04x oif=%d try_hard=%d\n",
+                       dn_ntohs(fl.fld_dst), dn_ntohs(fl.fld_src),
+                       fl.oif, try_hard);
 
         /*
          * N.B. If the kernel is compiled without router support then
@@ -1218,8 +1221,8 @@ static int dn_route_input_slow(struct sk_buff *skb)
         struct neighbour *neigh = NULL;
         unsigned hash;
         int flags = 0;
-        __u16 gateway = 0;
-        __u16 local_src = 0;
+        __le16 gateway = 0;
+        __le16 local_src = 0;
         struct flowi fl = { .nl_u = { .dn_u = 
                                      { .daddr = cb->dst,
                                        .saddr = cb->src,
@@ -1266,7 +1269,7 @@ static int dn_route_input_slow(struct sk_buff *skb)
                 res.type = RTN_LOCAL;
                 flags |= RTCF_DIRECTSRC;
         } else {
-                __u16 src_map = fl.fld_src;
+                __le16 src_map = fl.fld_src;
                 free_res = 1;
 
                 out_dev = DN_FIB_RES_DEV(res);
diff --git a/net/decnet/dn_rules.c b/net/decnet/dn_rules.c
index 1060de70bc0c..f2c299dfe030 100644
--- a/net/decnet/dn_rules.c
+++ b/net/decnet/dn_rules.c
@@ -46,11 +46,11 @@ struct dn_fib_rule
         unsigned char           r_action;
         unsigned char           r_dst_len;
         unsigned char           r_src_len;
-        dn_address              r_src;
-        dn_address              r_srcmask;
-        dn_address              r_dst;
-        dn_address              r_dstmask;
-        dn_address              r_srcmap;
+        __le16                  r_src;
+        __le16                  r_srcmask;
+        __le16                  r_dst;
+        __le16                  r_dstmask;
+        __le16                  r_srcmap;
         u8                      r_flags;
 #ifdef CONFIG_DECNET_ROUTE_FWMARK
         u32                     r_fwmark;
@@ -208,8 +208,8 @@ int dn_fib_lookup(const struct flowi *flp, struct dn_fib_res *res)
 {
         struct dn_fib_rule *r, *policy;
         struct dn_fib_table *tb;
-        dn_address saddr = flp->fld_src;
-        dn_address daddr = flp->fld_dst;
+        __le16 saddr = flp->fld_src;
+        __le16 daddr = flp->fld_dst;
         int err;
 
         read_lock(&dn_fib_rules_lock);
@@ -259,7 +259,7 @@ int dn_fib_lookup(const struct flowi *flp, struct dn_fib_res *res)
         return -ESRCH;
 }
 
-unsigned dnet_addr_type(__u16 addr)
+unsigned dnet_addr_type(__le16 addr)
 {
         struct flowi fl = { .nl_u = { .dn_u = { .daddr = addr } } };
         struct dn_fib_res res;
@@ -277,7 +277,7 @@ unsigned dnet_addr_type(__u16 addr)
         return ret;
 }
 
-__u16 dn_fib_rules_policy(__u16 saddr, struct dn_fib_res *res, unsigned *flags)
+__le16 dn_fib_rules_policy(__le16 saddr, struct dn_fib_res *res, unsigned *flags)
 {
         struct dn_fib_rule *r = res->r;
 
diff --git a/net/decnet/dn_table.c b/net/decnet/dn_table.c
index 6f8b5658cb4e..0ebc46af1bdd 100644
--- a/net/decnet/dn_table.c
+++ b/net/decnet/dn_table.c
@@ -46,7 +46,7 @@ struct dn_zone
         u32                     dz_hashmask;
 #define DZ_HASHMASK(dz) ((dz)->dz_hashmask)
         int                     dz_order;
-        u16                     dz_mask;
+        __le16                  dz_mask;
 #define DZ_MASK(dz)     ((dz)->dz_mask)
 };
 
@@ -84,14 +84,14 @@ static int dn_fib_hash_zombies;
 
 static inline dn_fib_idx_t dn_hash(dn_fib_key_t key, struct dn_zone *dz)
 {
-        u16 h = ntohs(key.datum)>>(16 - dz->dz_order);
+        u16 h = dn_ntohs(key.datum)>>(16 - dz->dz_order);
         h ^= (h >> 10);
         h ^= (h >> 6);
         h &= DZ_HASHMASK(dz);
         return *(dn_fib_idx_t *)&h;
 }
 
-static inline dn_fib_key_t dz_key(u16 dst, struct dn_zone *dz)
+static inline dn_fib_key_t dz_key(__le16 dst, struct dn_zone *dz)
 {
         dn_fib_key_t k;
         k.datum = dst & DZ_MASK(dz);
@@ -250,7 +250,7 @@ static int dn_fib_nh_match(struct rtmsg *r, struct nlmsghdr *nlh, struct dn_kern
 
         for_nexthops(fi) {
                 int attrlen = nhlen - sizeof(struct rtnexthop);
-                dn_address gw;
+                __le16 gw;
 
                 if (attrlen < 0 || (nhlen -= nhp->rtnh_len) < 0)
                         return -EINVAL;
@@ -457,7 +457,7 @@ static int dn_fib_table_insert(struct dn_fib_table *tb, struct rtmsg *r, struct
 
         dz_key_0(key);
         if (rta->rta_dst) {
-                dn_address dst;
+                __le16 dst;
                 memcpy(&dst, rta->rta_dst, 2);
                 if (dst & ~DZ_MASK(dz))
                         return -EINVAL;
@@ -593,7 +593,7 @@ static int dn_fib_table_delete(struct dn_fib_table *tb, struct rtmsg *r, struct
 
         dz_key_0(key);
         if (rta->rta_dst) {
-                dn_address dst;
+                __le16 dst;
                 memcpy(&dst, rta->rta_dst, 2);
                 if (dst & ~DZ_MASK(dz))
                         return -EINVAL;
diff --git a/net/decnet/sysctl_net_decnet.c b/net/decnet/sysctl_net_decnet.c
index 0e9d2c571165..bda5920215fd 100644
--- a/net/decnet/sysctl_net_decnet.c
+++ b/net/decnet/sysctl_net_decnet.c
@@ -86,9 +86,9 @@ static void strip_it(char *str)
  * Simple routine to parse an ascii DECnet address
  * into a network order address.
  */
-static int parse_addr(dn_address *addr, char *str)
+static int parse_addr(__le16 *addr, char *str)
 {
-        dn_address area, node;
+        __u16 area, node;
 
         while(*str && !ISNUM(*str)) str++;
 
@@ -139,7 +139,7 @@ static int dn_node_address_strategy(ctl_table *table, int __user *name, int nlen
                                 void **context)
 {
         size_t len;
-        dn_address addr;
+        __le16 addr;
 
         if (oldval && oldlenp) {
                 if (get_user(len, oldlenp))
@@ -147,14 +147,14 @@ static int dn_node_address_strategy(ctl_table *table, int __user *name, int nlen
                 if (len) {
                         if (len != sizeof(unsigned short))
                                 return -EINVAL;
-                        if (put_user(decnet_address, (unsigned short __user *)oldval))
+                        if (put_user(decnet_address, (__le16 __user *)oldval))
                                 return -EFAULT;
                 }
         }
         if (newval && newlen) {
                 if (newlen != sizeof(unsigned short))
                         return -EINVAL;
-                if (get_user(addr, (unsigned short __user *)newval))
+                if (get_user(addr, (__le16 __user *)newval))
                         return -EFAULT;
 
                 dn_dev_devices_off();
@@ -173,7 +173,7 @@ static int dn_node_address_handler(ctl_table *table, int write,
 {
         char addr[DN_ASCBUF_LEN];
         size_t len;
-        dn_address dnaddr;
+        __le16 dnaddr;
 
         if (!*lenp || (*ppos && !write)) {
                 *lenp = 0;