decnet: remove private wrappers of endian helpers

Signed-off-by: Harvey Harrison <harvey.harrison@gmail.com> Reviewed-by: Steven Whitehouse <swhiteho@redhat.com> Signed-off-by: David S. Miller <davem@davemloft.net>

decnet: remove private wrappers of endian helpers
Signed-off-by: Harvey Harrison <harvey.harrison@gmail.com> Reviewed-by: Steven Whitehouse <swhiteho@redhat.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Harvey Harrison · David S. Miller
1 parent 5b9ab2ec04
Showing 10 changed files with 94 additions and 94 deletions Side-by-side Diff
include/net/dn.h
include/net/dn_fib.h
net/decnet/af_decnet.c
net/decnet/dn_dev.c
net/decnet/dn_neigh.c
net/decnet/dn_nsp_in.c
net/decnet/dn_nsp_out.c
net/decnet/dn_route.c
net/decnet/dn_table.c
net/decnet/sysctl_net_decnet.c
@@ -4,10 +4,8 @@
 #include <linux/dn.h>
 #include <net/sock.h>
 #include <asm/byteorder.h>
+#include <asm/unalignedh>
  
-#define dn_ntohs(x) le16_to_cpu(x)
-#define dn_htons(x) cpu_to_le16(x)
-
 struct dn_scp                                   /* Session Control Port */
 {
         unsigned char           state;
@@ -175,7 +173,7 @@
  
 static inline __le16 dn_eth2dn(unsigned char *ethaddr)
 {
-	return dn_htons(ethaddr[4] | (ethaddr[5] << 8));
+	return get_unaligned((__le16 *)(ethaddr + 4));
 }
  
 static inline __le16 dn_saddr2dn(struct sockaddr_dn *saddr)
@@ -185,7 +183,7 @@
  
 static inline void dn_dn2eth(unsigned char *ethaddr, __le16 addr)
 {
-	__u16 a = dn_ntohs(addr);
+	__u16 a = le16_to_cpu(addr);
 	ethaddr[0] = 0xAA;
 	ethaddr[1] = 0x00;
 	ethaddr[2] = 0x04;
@@ -181,9 +181,9 @@
  
 static inline __le16 dnet_make_mask(int n)
 {
-        if (n)
-                return dn_htons(~((1<<(16-n))-1));
-        return 0;
+	if (n)
+		return cpu_to_le16(~((1 << (16 - n)) - 1));
+	return cpu_to_le16(0);
 }
  
 #endif /* _NET_DN_FIB_H */
@@ -167,7 +167,7 @@
 	if (scp->addr.sdn_flags & SDF_WILD)
 		return hlist_empty(&dn_wild_sk) ? &dn_wild_sk : NULL;
  
-	return &dn_sk_hash[dn_ntohs(scp->addrloc) & DN_SK_HASH_MASK];
+	return &dn_sk_hash[le16_to_cpu(scp->addrloc) & DN_SK_HASH_MASK];
 }
  
 /*
@@ -181,7 +181,7 @@
 	if (port == 0)
 		return -1;
  
-	sk_for_each(sk, node, &dn_sk_hash[dn_ntohs(port) & DN_SK_HASH_MASK]) {
+	sk_for_each(sk, node, &dn_sk_hash[le16_to_cpu(port) & DN_SK_HASH_MASK]) {
 		struct dn_scp *scp = DN_SK(sk);
 		if (scp->addrloc == port)
 			return -1;
  
@@ -195,12 +195,12 @@
 static unsigned short port = 0x2000;
 	unsigned short i_port = port;
  
-	while(check_port(dn_htons(++port)) != 0) {
+	while(check_port(cpu_to_le16(++port)) != 0) {
 		if (port == i_port)
 			return 0;
 	}
  
-	scp->addrloc = dn_htons(port);
+	scp->addrloc = cpu_to_le16(port);
  
 	return 1;
 }
@@ -255,7 +255,7 @@
  
 	if (hash == 0) {
 		hash = addr->sdn_objnamel;
-		for(i = 0; i < dn_ntohs(addr->sdn_objnamel); i++) {
+		for(i = 0; i < le16_to_cpu(addr->sdn_objnamel); i++) {
 			hash ^= addr->sdn_objname[i];
 			hash ^= (hash << 3);
 		}
  
@@ -297,16 +297,16 @@
 			break;
 		case 1:
 			*buf++ = 0;
-			*buf++ = dn_ntohs(sdn->sdn_objnamel);
-			memcpy(buf, sdn->sdn_objname, dn_ntohs(sdn->sdn_objnamel));
-			len = 3 + dn_ntohs(sdn->sdn_objnamel);
+			*buf++ = le16_to_cpu(sdn->sdn_objnamel);
+			memcpy(buf, sdn->sdn_objname, le16_to_cpu(sdn->sdn_objnamel));
+			len = 3 + le16_to_cpu(sdn->sdn_objnamel);
 			break;
 		case 2:
 			memset(buf, 0, 5);
 			buf += 5;
-			*buf++ = dn_ntohs(sdn->sdn_objnamel);
-			memcpy(buf, sdn->sdn_objname, dn_ntohs(sdn->sdn_objnamel));
-			len = 7 + dn_ntohs(sdn->sdn_objnamel);
+			*buf++ = le16_to_cpu(sdn->sdn_objnamel);
+			memcpy(buf, sdn->sdn_objname, le16_to_cpu(sdn->sdn_objnamel));
+			len = 7 + le16_to_cpu(sdn->sdn_objnamel);
 			break;
 	}
  
@@ -327,7 +327,7 @@
 	int namel = 12;
  
 	sdn->sdn_objnum = 0;
-	sdn->sdn_objnamel = dn_htons(0);
+	sdn->sdn_objnamel = cpu_to_le16(0);
 	memset(sdn->sdn_objname, 0, DN_MAXOBJL);
  
 	if (len < 2)
  
  
@@ -361,13 +361,13 @@
 	if (len < 0)
 		return -1;
  
-	sdn->sdn_objnamel = dn_htons(*data++);
-	len -= dn_ntohs(sdn->sdn_objnamel);
+	sdn->sdn_objnamel = cpu_to_le16(*data++);
+	len -= le16_to_cpu(sdn->sdn_objnamel);
  
-	if ((len < 0) || (dn_ntohs(sdn->sdn_objnamel) > namel))
+	if ((len < 0) || (le16_to_cpu(sdn->sdn_objnamel) > namel))
 		return -1;
  
-	memcpy(sdn->sdn_objname, data, dn_ntohs(sdn->sdn_objnamel));
+	memcpy(sdn->sdn_objname, data, le16_to_cpu(sdn->sdn_objnamel));
  
 	return size - len;
 }
@@ -391,7 +391,7 @@
 				continue;
 			if (scp->addr.sdn_objnamel != addr->sdn_objnamel)
 				continue;
-			if (memcmp(scp->addr.sdn_objname, addr->sdn_objname, dn_ntohs(addr->sdn_objnamel)) != 0)
+			if (memcmp(scp->addr.sdn_objname, addr->sdn_objname, le16_to_cpu(addr->sdn_objnamel)) != 0)
 				continue;
 		}
 		sock_hold(sk);
@@ -419,7 +419,7 @@
 	struct dn_scp *scp;
  
 	read_lock(&dn_hash_lock);
-	sk_for_each(sk, node, &dn_sk_hash[dn_ntohs(cb->dst_port) & DN_SK_HASH_MASK]) {
+	sk_for_each(sk, node, &dn_sk_hash[le16_to_cpu(cb->dst_port) & DN_SK_HASH_MASK]) {
 		scp = DN_SK(sk);
 		if (cb->src != dn_saddr2dn(&scp->peer))
 			continue;
  
@@ -734,10 +734,10 @@
 	if (saddr->sdn_family != AF_DECnet)
 		return -EINVAL;
  
-	if (dn_ntohs(saddr->sdn_nodeaddrl) && (dn_ntohs(saddr->sdn_nodeaddrl) != 2))
+	if (le16_to_cpu(saddr->sdn_nodeaddrl) && (le16_to_cpu(saddr->sdn_nodeaddrl) != 2))
 		return -EINVAL;
  
-	if (dn_ntohs(saddr->sdn_objnamel) > DN_MAXOBJL)
+	if (le16_to_cpu(saddr->sdn_objnamel) > DN_MAXOBJL)
 		return -EINVAL;
  
 	if (saddr->sdn_flags & ~SDF_WILD)
@@ -748,7 +748,7 @@
 		return -EACCES;
  
 	if (!(saddr->sdn_flags & SDF_WILD)) {
-		if (dn_ntohs(saddr->sdn_nodeaddrl)) {
+		if (le16_to_cpu(saddr->sdn_nodeaddrl)) {
 			read_lock(&dev_base_lock);
 			ldev = NULL;
 			for_each_netdev(&init_net, dev) {
  
@@ -799,15 +799,15 @@
 	if ((scp->accessdata.acc_accl != 0) &&
 		(scp->accessdata.acc_accl <= 12)) {
  
-		scp->addr.sdn_objnamel = dn_htons(scp->accessdata.acc_accl);
-		memcpy(scp->addr.sdn_objname, scp->accessdata.acc_acc, dn_ntohs(scp->addr.sdn_objnamel));
+		scp->addr.sdn_objnamel = cpu_to_le16(scp->accessdata.acc_accl);
+		memcpy(scp->addr.sdn_objname, scp->accessdata.acc_acc, le16_to_cpu(scp->addr.sdn_objnamel));
  
 		scp->accessdata.acc_accl = 0;
 		memset(scp->accessdata.acc_acc, 0, 40);
 	}
 	/* End of compatibility stuff */
  
-	scp->addr.sdn_add.a_len = dn_htons(2);
+	scp->addr.sdn_add.a_len = cpu_to_le16(2);
 	rv = dn_dev_bind_default((__le16 *)scp->addr.sdn_add.a_addr);
 	if (rv == 0) {
 		rv = dn_hash_sock(sk);
@@ -1027,7 +1027,7 @@
 	u16 len = *ptr++; /* yes, it's 8bit on the wire */
  
 	BUG_ON(len > 16); /* we've checked the contents earlier */
-	opt->opt_optl   = dn_htons(len);
+	opt->opt_optl   = cpu_to_le16(len);
 	opt->opt_status = 0;
 	memcpy(opt->opt_data, ptr, len);
 	skb_pull(skb, len + 1);
@@ -1375,7 +1375,7 @@
 			if (optlen != sizeof(struct optdata_dn))
 				return -EINVAL;
  
-			if (dn_ntohs(u.opt.opt_optl) > 16)
+			if (le16_to_cpu(u.opt.opt_optl) > 16)
 				return -EINVAL;
  
 			memcpy(&scp->conndata_out, &u.opt, optlen);
@@ -1388,7 +1388,7 @@
 			if (optlen != sizeof(struct optdata_dn))
 				return -EINVAL;
  
-			if (dn_ntohs(u.opt.opt_optl) > 16)
+			if (le16_to_cpu(u.opt.opt_optl) > 16)
 				return -EINVAL;
  
 			memcpy(&scp->discdata_out, &u.opt, optlen);
  
@@ -2213,12 +2213,12 @@
 {
 	int i;
  
-	switch (dn_ntohs(dn->sdn_objnamel)) {
+	switch (le16_to_cpu(dn->sdn_objnamel)) {
 		case 0:
 			sprintf(buf, "%d", dn->sdn_objnum);
 			break;
 		default:
-			for (i = 0; i < dn_ntohs(dn->sdn_objnamel); i++) {
+			for (i = 0; i < le16_to_cpu(dn->sdn_objnamel); i++) {
 				buf[i] = dn->sdn_objname[i];
 				if (IS_NOT_PRINTABLE(buf[i]))
 					buf[i] = '.';
@@ -2281,7 +2281,7 @@
 	seq_printf(seq,
 		   "%6s/%04X %04d:%04d %04d:%04d %01d %-16s "
 		   "%6s/%04X %04d:%04d %04d:%04d %01d %-16s %4s %s\n",
-		   dn_addr2asc(dn_ntohs(dn_saddr2dn(&scp->addr)), buf1),
+		   dn_addr2asc(le16_to_cpu(dn_saddr2dn(&scp->addr)), buf1),
 		   scp->addrloc,
 		   scp->numdat,
 		   scp->numoth,
@@ -2289,7 +2289,7 @@
 		   scp->ackxmt_oth,
 		   scp->flowloc_sw,
 		   local_object,
-		   dn_addr2asc(dn_ntohs(dn_saddr2dn(&scp->peer)), buf2),
+		   dn_addr2asc(le16_to_cpu(dn_saddr2dn(&scp->peer)), buf2),
 		   scp->addrrem,
 		   scp->numdat_rcv,
 		   scp->numoth_rcv,
@@ -885,7 +885,7 @@
 	memcpy(msg->tiver, dn_eco_version, 3);
 	dn_dn2eth(msg->id, ifa->ifa_local);
 	msg->iinfo   = DN_RT_INFO_ENDN;
-	msg->blksize = dn_htons(mtu2blksize(dev));
+	msg->blksize = cpu_to_le16(mtu2blksize(dev));
 	msg->area    = 0x00;
 	memset(msg->seed, 0, 8);
 	memcpy(msg->neighbor, dn_hiord, ETH_ALEN);
  
@@ -895,13 +895,13 @@
 		dn_dn2eth(msg->neighbor, dn->addr);
 	}
  
-	msg->timer   = dn_htons((unsigned short)dn_db->parms.t3);
+	msg->timer   = cpu_to_le16((unsigned short)dn_db->parms.t3);
 	msg->mpd     = 0x00;
 	msg->datalen = 0x02;
 	memset(msg->data, 0xAA, 2);
  
 	pktlen = (__le16 *)skb_push(skb,2);
-	*pktlen = dn_htons(skb->len - 2);
+	*pktlen = cpu_to_le16(skb->len - 2);
  
 	skb_reset_network_header(skb);
  
@@ -929,7 +929,7 @@
 	if (dn->priority != dn_db->parms.priority)
 		return 0;
  
-	if (dn_ntohs(dn->addr) < dn_ntohs(ifa->ifa_local))
+	if (le16_to_cpu(dn->addr) < le16_to_cpu(ifa->ifa_local))
 		return 1;
  
 	return 0;
  
@@ -973,11 +973,11 @@
 	ptr += ETH_ALEN;
 	*ptr++ = dn_db->parms.forwarding == 1 ?
 			DN_RT_INFO_L1RT : DN_RT_INFO_L2RT;
-	*((__le16 *)ptr) = dn_htons(mtu2blksize(dev));
+	*((__le16 *)ptr) = cpu_to_le16(mtu2blksize(dev));
 	ptr += 2;
 	*ptr++ = dn_db->parms.priority; /* Priority */
 	*ptr++ = 0; /* Area: Reserved */
-	*((__le16 *)ptr) = dn_htons((unsigned short)dn_db->parms.t3);
+	*((__le16 *)ptr) = cpu_to_le16((unsigned short)dn_db->parms.t3);
 	ptr += 2;
 	*ptr++ = 0; /* MPD: Reserved */
 	i1 = ptr++;
@@ -993,7 +993,7 @@
 	skb_trim(skb, (27 + *i2));
  
 	pktlen = (__le16 *)skb_push(skb, 2);
-	*pktlen = dn_htons(skb->len - 2);
+	*pktlen = cpu_to_le16(skb->len - 2);
  
 	skb_reset_network_header(skb);
  
@@ -1401,8 +1401,8 @@
 				mtu2blksize(dev),
 				dn_db->parms.priority,
 				dn_db->parms.state, dn_db->parms.name,
-				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) : "");
+				dn_db->router ? dn_addr2asc(le16_to_cpu(*(__le16 *)dn_db->router->primary_key), router_buf) : "",
+				dn_db->peer ? dn_addr2asc(le16_to_cpu(*(__le16 *)dn_db->peer->primary_key), peer_buf) : "");
 	}
 	return 0;
 }
@@ -1445,7 +1445,7 @@
 		return;
 	}
  
-	decnet_address = dn_htons((addr[0] << 10) | addr[1]);
+	decnet_address = cpu_to_le16((addr[0] << 10) | addr[1]);
  
 	dn_dev_devices_on();
  
@@ -250,7 +250,7 @@
 	data = skb_push(skb, sizeof(struct dn_long_packet) + 3);
 	lp = (struct dn_long_packet *)(data+3);
  
-	*((__le16 *)data) = dn_htons(skb->len - 2);
+	*((__le16 *)data) = cpu_to_le16(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));
@@ -294,7 +294,7 @@
 	}
  
 	data = skb_push(skb, sizeof(struct dn_short_packet) + 2);
-	*((__le16 *)data) = dn_htons(skb->len - 2);
+	*((__le16 *)data) = cpu_to_le16(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));
  
@@ -336,12 +336,12 @@
 	}
  
 	data = skb_push(skb, sizeof(struct dn_short_packet) + 2);
-	*((__le16 *)data) = dn_htons(skb->len - 2);
+	*((__le16 *)data) = cpu_to_le16(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));
-	sp->dstnode  = cb->dst & dn_htons(0x03ff);
-	sp->srcnode  = cb->src & dn_htons(0x03ff);
+	sp->dstnode  = cb->dst & cpu_to_le16(0x03ff);
+	sp->srcnode  = cb->src & cpu_to_le16(0x03ff);
 	sp->forward  = cb->hops & 0x3f;
  
 	skb_reset_network_header(skb);
@@ -394,7 +394,7 @@
 			if (neigh->dev->type == ARPHRD_ETHER)
 				memcpy(neigh->ha, &eth_hdr(skb)->h_source, ETH_ALEN);
  
-			dn->blksize  = dn_ntohs(msg->blksize);
+			dn->blksize  = le16_to_cpu(msg->blksize);
 			dn->priority = msg->priority;
  
 			dn->flags &= ~DN_NDFLAG_P3;
@@ -410,7 +410,7 @@
 		}
  
 		/* Only use routers in our area */
-		if ((dn_ntohs(src)>>10) == (dn_ntohs((decnet_address))>>10)) {
+		if ((le16_to_cpu(src)>>10) == (le16_to_cpu((decnet_address))>>10)) {
 			if (!dn_db->router) {
 				dn_db->router = neigh_clone(neigh);
 			} else {
@@ -453,7 +453,7 @@
 			if (neigh->dev->type == ARPHRD_ETHER)
 				memcpy(neigh->ha, &eth_hdr(skb)->h_source, ETH_ALEN);
 			dn->flags   &= ~(DN_NDFLAG_R1 | DN_NDFLAG_R2);
-			dn->blksize  = dn_ntohs(msg->blksize);
+			dn->blksize  = le16_to_cpu(msg->blksize);
 			dn->priority = 0;
 		}
  
@@ -543,7 +543,7 @@
  
 	read_lock(&n->lock);
 	seq_printf(seq, "%-7s %s%s%s   %02x    %02d  %07ld %-8s\n",
-		   dn_addr2asc(dn_ntohs(dn->addr), buf),
+		   dn_addr2asc(le16_to_cpu(dn->addr), buf),
 		   (dn->flags&DN_NDFLAG_R1) ? "1" : "-",
 		   (dn->flags&DN_NDFLAG_R2) ? "2" : "-",
 		   (dn->flags&DN_NDFLAG_P3) ? "3" : "-",
@@ -83,7 +83,9 @@
 	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, dn_ntohs(cb->src), dn_ntohs(cb->dst), dn_ntohs(cb->src_port), dn_ntohs(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, le16_to_cpu(cb->src), le16_to_cpu(cb->dst),
+		       le16_to_cpu(cb->src_port), le16_to_cpu(cb->dst_port));
 	}
 }
  
@@ -133,7 +135,7 @@
 	if (skb->len < 2)
 		return len;
  
-	if ((ack = dn_ntohs(*ptr)) & 0x8000) {
+	if ((ack = le16_to_cpu(*ptr)) & 0x8000) {
 		skb_pull(skb, 2);
 		ptr++;
 		len += 2;
@@ -147,7 +149,7 @@
 	if (skb->len < 2)
 		return len;
  
-	if ((ack = dn_ntohs(*ptr)) & 0x8000) {
+	if ((ack = le16_to_cpu(*ptr)) & 0x8000) {
 		skb_pull(skb, 2);
 		len += 2;
 		if ((ack & 0x4000) == 0) {
@@ -237,7 +239,7 @@
 	cb->dst_port = msg->dstaddr;
 	cb->services = msg->services;
 	cb->info     = msg->info;
-	cb->segsize  = dn_ntohs(msg->segsize);
+	cb->segsize  = le16_to_cpu(msg->segsize);
  
 	if (!pskb_may_pull(skb, sizeof(*msg)))
 		goto err_out;
@@ -344,7 +346,7 @@
 	ptr = skb->data;
 	cb->services = *ptr++;
 	cb->info = *ptr++;
-	cb->segsize = dn_ntohs(*(__le16 *)ptr);
+	cb->segsize = le16_to_cpu(*(__le16 *)ptr);
  
 	if ((scp->state == DN_CI) || (scp->state == DN_CD)) {
 		scp->persist = 0;
@@ -361,7 +363,7 @@
 		if (skb->len > 0) {
 			u16 dlen = *skb->data;
 			if ((dlen <= 16) && (dlen <= skb->len)) {
-				scp->conndata_in.opt_optl = dn_htons(dlen);
+				scp->conndata_in.opt_optl = cpu_to_le16(dlen);
 				skb_copy_from_linear_data_offset(skb, 1,
 					      scp->conndata_in.opt_data, dlen);
 			}
  
  
@@ -396,17 +398,17 @@
 	if (skb->len < 2)
 		goto out;
  
-	reason = dn_ntohs(*(__le16 *)skb->data);
+	reason = le16_to_cpu(*(__le16 *)skb->data);
 	skb_pull(skb, 2);
  
-	scp->discdata_in.opt_status = dn_htons(reason);
+	scp->discdata_in.opt_status = cpu_to_le16(reason);
 	scp->discdata_in.opt_optl   = 0;
 	memset(scp->discdata_in.opt_data, 0, 16);
  
 	if (skb->len > 0) {
 		u16 dlen = *skb->data;
 		if ((dlen <= 16) && (dlen <= skb->len)) {
-			scp->discdata_in.opt_optl = dn_htons(dlen);
+			scp->discdata_in.opt_optl = cpu_to_le16(dlen);
 			skb_copy_from_linear_data_offset(skb, 1, scp->discdata_in.opt_data, dlen);
 		}
 	}
@@ -463,7 +465,7 @@
 	if (skb->len != 2)
 		goto out;
  
-	reason = dn_ntohs(*(__le16 *)skb->data);
+	reason = le16_to_cpu(*(__le16 *)skb->data);
  
 	sk->sk_state = TCP_CLOSE;
  
@@ -512,7 +514,7 @@
 	if (skb->len != 4)
 		goto out;
  
-	segnum = dn_ntohs(*(__le16 *)ptr);
+	segnum = le16_to_cpu(*(__le16 *)ptr);
 	ptr += 2;
 	lsflags = *(unsigned char *)ptr++;
 	fcval = *ptr;
@@ -620,7 +622,7 @@
 	if (skb->len < 2)
 		goto out;
  
-	cb->segnum = segnum = dn_ntohs(*(__le16 *)skb->data);
+	cb->segnum = segnum = le16_to_cpu(*(__le16 *)skb->data);
 	skb_pull(skb, 2);
  
 	if (seq_next(scp->numoth_rcv, segnum)) {
@@ -648,7 +650,7 @@
 	if (skb->len < 2)
 		goto out;
  
-	cb->segnum = segnum = dn_ntohs(*(__le16 *)skb->data);
+	cb->segnum = segnum = le16_to_cpu(*(__le16 *)skb->data);
 	skb_pull(skb, 2);
  
 	if (seq_next(scp->numdat_rcv, segnum)) {
@@ -325,8 +325,8 @@
  
 	ptr = (__le16 *)dn_mk_common_header(scp, skb, msgflag, hlen);
  
-	*ptr++ = dn_htons(acknum);
-	*ptr++ = dn_htons(ackcrs);
+	*ptr++ = cpu_to_le16(acknum);
+	*ptr++ = cpu_to_le16(ackcrs);
  
 	return ptr;
 }
@@ -344,7 +344,7 @@
 		cb->segnum = scp->numdat;
 		seq_add(&scp->numdat, 1);
 	}
-	*(ptr++) = dn_htons(cb->segnum);
+	*(ptr++) = cpu_to_le16(cb->segnum);
  
 	return ptr;
 }
@@ -522,7 +522,7 @@
 	struct dn_scp *scp = DN_SK(sk);
 	struct sk_buff *skb = NULL;
 	struct nsp_conn_init_msg *msg;
-	__u8 len = (__u8)dn_ntohs(scp->conndata_out.opt_optl);
+	__u8 len = (__u8)le16_to_cpu(scp->conndata_out.opt_optl);
  
 	if ((skb = dn_alloc_skb(sk, 50 + len, gfp)) == NULL)
 		return;
@@ -533,7 +533,7 @@
 	msg->srcaddr = scp->addrloc;
 	msg->services = scp->services_loc;
 	msg->info = scp->info_loc;
-	msg->segsize = dn_htons(scp->segsize_loc);
+	msg->segsize = cpu_to_le16(scp->segsize_loc);
  
 	*skb_put(skb,1) = len;
  
@@ -559,7 +559,7 @@
  
 	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", dn_ntohs(rem), dst);
+			printk(KERN_DEBUG "DECnet: dn_nsp_do_disc: BUG! Please report this to SteveW@ACM.org rem=%u dst=%p\n", le16_to_cpu(rem), dst);
 		return;
 	}
  
@@ -572,7 +572,7 @@
 	msg += 2;
 	*(__le16 *)msg = loc;
 	msg += 2;
-	*(__le16 *)msg = dn_htons(reason);
+	*(__le16 *)msg = cpu_to_le16(reason);
 	msg += 2;
 	if (msgflg == NSP_DISCINIT)
 		*msg++ = ddl;
  
@@ -598,10 +598,10 @@
 	int ddl = 0;
  
 	if (msgflg == NSP_DISCINIT)
-		ddl = dn_ntohs(scp->discdata_out.opt_optl);
+		ddl = le16_to_cpu(scp->discdata_out.opt_optl);
  
 	if (reason == 0)
-		reason = dn_ntohs(scp->discdata_out.opt_status);
+		reason = le16_to_cpu(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);
@@ -675,7 +675,7 @@
 	msg->srcaddr	= scp->addrloc;
 	msg->services	= scp->services_loc;	/* Requested flow control    */
 	msg->info	= scp->info_loc;	/* Version Number            */
-	msg->segsize	= dn_htons(scp->segsize_loc);	/* Max segment size  */
+	msg->segsize	= cpu_to_le16(scp->segsize_loc);	/* Max segment size  */
  
 	if (scp->peer.sdn_objnum)
 		type = 0;
@@ -708,7 +708,7 @@
 	if (aux > 0)
 	memcpy(skb_put(skb, aux), scp->accessdata.acc_acc, aux);
  
-	aux = (__u8)dn_ntohs(scp->conndata_out.opt_optl);
+	aux = (__u8)le16_to_cpu(scp->conndata_out.opt_optl);
 	*skb_put(skb, 1) = aux;
 	if (aux > 0)
 	memcpy(skb_put(skb,aux), scp->conndata_out.opt_data, aux);
@@ -475,7 +475,7 @@
 		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,
-			dn_ntohs(cb->src), dn_ntohs(cb->dst),
+			le16_to_cpu(cb->src), le16_to_cpu(cb->dst),
 			err, skb->pkt_type);
 	}
  
@@ -575,7 +575,7 @@
 {
 	struct dn_skb_cb *cb;
 	unsigned char flags = 0;
-	__u16 len = dn_ntohs(*(__le16 *)skb->data);
+	__u16 len = le16_to_cpu(*(__le16 *)skb->data);
 	struct dn_dev *dn = (struct dn_dev *)dev->dn_ptr;
 	unsigned char padlen = 0;
  
@@ -773,7 +773,7 @@
 		struct dn_skb_cb *cb = DN_SKB_CB(skb);
  
 		printk(KERN_DEBUG "dn_rt_bug: skb from:%04x to:%04x\n",
-				dn_ntohs(cb->src), dn_ntohs(cb->dst));
+				le16_to_cpu(cb->src), le16_to_cpu(cb->dst));
 	}
  
 	kfree_skb(skb);
@@ -816,7 +816,7 @@
  
 static inline int dn_match_addr(__le16 addr1, __le16 addr2)
 {
-	__u16 tmp = dn_ntohs(addr1) ^ dn_ntohs(addr2);
+	__u16 tmp = le16_to_cpu(addr1) ^ le16_to_cpu(addr2);
 	int match = 16;
 	while(tmp) {
 		tmp >>= 1;
@@ -886,8 +886,8 @@
 	if (decnet_debug_level & 16)
 		printk(KERN_DEBUG
 		       "dn_route_output_slow: dst=%04x src=%04x mark=%d"
-		       " iif=%d oif=%d\n", dn_ntohs(oldflp->fld_dst),
-		       dn_ntohs(oldflp->fld_src),
+		       " iif=%d oif=%d\n", le16_to_cpu(oldflp->fld_dst),
+		       le16_to_cpu(oldflp->fld_src),
 		       oldflp->mark, init_net.loopback_dev->ifindex, oldflp->oif);
  
 	/* If we have an output interface, verify its a DECnet device */
@@ -959,7 +959,7 @@
 		printk(KERN_DEBUG
 		       "dn_route_output_slow: initial checks complete."
 		       " dst=%o4x src=%04x oif=%d try_hard=%d\n",
-		       dn_ntohs(fl.fld_dst), dn_ntohs(fl.fld_src),
+		       le16_to_cpu(fl.fld_dst), le16_to_cpu(fl.fld_src),
 		       fl.oif, try_hard);
  
 	/*
@@ -1711,8 +1711,8 @@
  
 	seq_printf(seq, "%-8s %-7s %-7s %04d %04d %04d\n",
 			rt->u.dst.dev ? rt->u.dst.dev->name : "*",
-			dn_addr2asc(dn_ntohs(rt->rt_daddr), buf1),
-			dn_addr2asc(dn_ntohs(rt->rt_saddr), buf2),
+			dn_addr2asc(le16_to_cpu(rt->rt_daddr), buf1),
+			dn_addr2asc(le16_to_cpu(rt->rt_saddr), buf2),
 			atomic_read(&rt->u.dst.__refcnt),
 			rt->u.dst.__use,
 			(int) dst_metric(&rt->u.dst, RTAX_RTT));
@@ -85,7 +85,7 @@
  
 static inline dn_fib_idx_t dn_hash(dn_fib_key_t key, struct dn_zone *dz)
 {
-	u16 h = dn_ntohs(key.datum)>>(16 - dz->dz_order);
+	u16 h = le16_to_cpu(key.datum)>>(16 - dz->dz_order);
 	h ^= (h >> 10);
 	h ^= (h >> 6);
 	h &= DZ_HASHMASK(dz);
@@ -126,7 +126,7 @@
 	if (INVALID_END_CHAR(*str))
 		return -1;
  
-	*addr = dn_htons((area << 10) | node);
+	*addr = cpu_to_le16((area << 10) | node);
  
 	return 0;
 }
@@ -201,7 +201,7 @@
 		return 0;
 	}
  
-	dn_addr2asc(dn_ntohs(decnet_address), addr);
+	dn_addr2asc(le16_to_cpu(decnet_address), addr);
 	len = strlen(addr);
 	addr[len++] = '\n';
...	...	@@ -4,10 +4,8 @@
4	4	#include <linux/dn.h>
5	5	#include <net/sock.h>
6	6	#include <asm/byteorder.h>
	7	+#include <asm/unalignedh>
7	8
8		-#define dn_ntohs(x) le16_to_cpu(x)
9		-#define dn_htons(x) cpu_to_le16(x)
10		-
11	9	struct dn_scp /* Session Control Port */
12	10	{
13	11	unsigned char state;
...	...	@@ -175,7 +173,7 @@
175	173
176	174	static inline __le16 dn_eth2dn(unsigned char *ethaddr)
177	175	{
178		- return dn_htons(ethaddr[4] \| (ethaddr[5] << 8));
	176	+ return get_unaligned((__le16 *)(ethaddr + 4));
179	177	}
180	178
181	179	static inline __le16 dn_saddr2dn(struct sockaddr_dn *saddr)
...	...	@@ -185,7 +183,7 @@
185	183
186	184	static inline void dn_dn2eth(unsigned char *ethaddr, __le16 addr)
187	185	{
188		- __u16 a = dn_ntohs(addr);
	186	+ __u16 a = le16_to_cpu(addr);
189	187	ethaddr[0] = 0xAA;
190	188	ethaddr[1] = 0x00;
191	189	ethaddr[2] = 0x04;
...	...	@@ -181,9 +181,9 @@
181	181
182	182	static inline __le16 dnet_make_mask(int n)
183	183	{
184		- if (n)
185		- return dn_htons(~((1<<(16-n))-1));
186		- return 0;
	184	+ if (n)
	185	+ return cpu_to_le16(~((1 << (16 - n)) - 1));
	186	+ return cpu_to_le16(0);
187	187	}
188	188
189	189	#endif /* _NET_DN_FIB_H */
...	...	@@ -167,7 +167,7 @@
167	167	if (scp->addr.sdn_flags & SDF_WILD)
168	168	return hlist_empty(&dn_wild_sk) ? &dn_wild_sk : NULL;
169	169
170		- return &dn_sk_hash[dn_ntohs(scp->addrloc) & DN_SK_HASH_MASK];
	170	+ return &dn_sk_hash[le16_to_cpu(scp->addrloc) & DN_SK_HASH_MASK];
171	171	}
172	172
173	173	/*
...	...	@@ -181,7 +181,7 @@
181	181	if (port == 0)
182	182	return -1;
183	183
184		- sk_for_each(sk, node, &dn_sk_hash[dn_ntohs(port) & DN_SK_HASH_MASK]) {
	184	+ sk_for_each(sk, node, &dn_sk_hash[le16_to_cpu(port) & DN_SK_HASH_MASK]) {
185	185	struct dn_scp *scp = DN_SK(sk);
186	186	if (scp->addrloc == port)
187	187	return -1;
188	188
...	...	@@ -195,12 +195,12 @@
195	195	static unsigned short port = 0x2000;
196	196	unsigned short i_port = port;
197	197
198		- while(check_port(dn_htons(++port)) != 0) {
	198	+ while(check_port(cpu_to_le16(++port)) != 0) {
199	199	if (port == i_port)
200	200	return 0;
201	201	}
202	202
203		- scp->addrloc = dn_htons(port);
	203	+ scp->addrloc = cpu_to_le16(port);
204	204
205	205	return 1;
206	206	}
...	...	@@ -255,7 +255,7 @@
255	255
256	256	if (hash == 0) {
257	257	hash = addr->sdn_objnamel;
258		- for(i = 0; i < dn_ntohs(addr->sdn_objnamel); i++) {
	258	+ for(i = 0; i < le16_to_cpu(addr->sdn_objnamel); i++) {
259	259	hash ^= addr->sdn_objname[i];
260	260	hash ^= (hash << 3);
261	261	}
262	262
...	...	@@ -297,16 +297,16 @@
297	297	break;
298	298	case 1:
299	299	*buf++ = 0;
300		- *buf++ = dn_ntohs(sdn->sdn_objnamel);
301		- memcpy(buf, sdn->sdn_objname, dn_ntohs(sdn->sdn_objnamel));
302		- len = 3 + dn_ntohs(sdn->sdn_objnamel);
	300	+ *buf++ = le16_to_cpu(sdn->sdn_objnamel);
	301	+ memcpy(buf, sdn->sdn_objname, le16_to_cpu(sdn->sdn_objnamel));
	302	+ len = 3 + le16_to_cpu(sdn->sdn_objnamel);
303	303	break;
304	304	case 2:
305	305	memset(buf, 0, 5);
306	306	buf += 5;
307		- *buf++ = dn_ntohs(sdn->sdn_objnamel);
308		- memcpy(buf, sdn->sdn_objname, dn_ntohs(sdn->sdn_objnamel));
309		- len = 7 + dn_ntohs(sdn->sdn_objnamel);
	307	+ *buf++ = le16_to_cpu(sdn->sdn_objnamel);
	308	+ memcpy(buf, sdn->sdn_objname, le16_to_cpu(sdn->sdn_objnamel));
	309	+ len = 7 + le16_to_cpu(sdn->sdn_objnamel);
310	310	break;
311	311	}
312	312
...	...	@@ -327,7 +327,7 @@
327	327	int namel = 12;
328	328
329	329	sdn->sdn_objnum = 0;
330		- sdn->sdn_objnamel = dn_htons(0);
	330	+ sdn->sdn_objnamel = cpu_to_le16(0);
331	331	memset(sdn->sdn_objname, 0, DN_MAXOBJL);
332	332
333	333	if (len < 2)
334	334
335	335
...	...	@@ -361,13 +361,13 @@
361	361	if (len < 0)
362	362	return -1;
363	363
364		- sdn->sdn_objnamel = dn_htons(*data++);
365		- len -= dn_ntohs(sdn->sdn_objnamel);
	364	+ sdn->sdn_objnamel = cpu_to_le16(*data++);
	365	+ len -= le16_to_cpu(sdn->sdn_objnamel);
366	366
367		- if ((len < 0) \|\| (dn_ntohs(sdn->sdn_objnamel) > namel))
	367	+ if ((len < 0) \|\| (le16_to_cpu(sdn->sdn_objnamel) > namel))
368	368	return -1;
369	369
370		- memcpy(sdn->sdn_objname, data, dn_ntohs(sdn->sdn_objnamel));
	370	+ memcpy(sdn->sdn_objname, data, le16_to_cpu(sdn->sdn_objnamel));
371	371
372	372	return size - len;
373	373	}
...	...	@@ -391,7 +391,7 @@
391	391	continue;
392	392	if (scp->addr.sdn_objnamel != addr->sdn_objnamel)
393	393	continue;
394		- if (memcmp(scp->addr.sdn_objname, addr->sdn_objname, dn_ntohs(addr->sdn_objnamel)) != 0)
	394	+ if (memcmp(scp->addr.sdn_objname, addr->sdn_objname, le16_to_cpu(addr->sdn_objnamel)) != 0)
395	395	continue;
396	396	}
397	397	sock_hold(sk);
...	...	@@ -419,7 +419,7 @@
419	419	struct dn_scp *scp;
420	420
421	421	read_lock(&dn_hash_lock);
422		- sk_for_each(sk, node, &dn_sk_hash[dn_ntohs(cb->dst_port) & DN_SK_HASH_MASK]) {
	422	+ sk_for_each(sk, node, &dn_sk_hash[le16_to_cpu(cb->dst_port) & DN_SK_HASH_MASK]) {
423	423	scp = DN_SK(sk);
424	424	if (cb->src != dn_saddr2dn(&scp->peer))
425	425	continue;
426	426
...	...	@@ -734,10 +734,10 @@
734	734	if (saddr->sdn_family != AF_DECnet)
735	735	return -EINVAL;
736	736
737		- if (dn_ntohs(saddr->sdn_nodeaddrl) && (dn_ntohs(saddr->sdn_nodeaddrl) != 2))
	737	+ if (le16_to_cpu(saddr->sdn_nodeaddrl) && (le16_to_cpu(saddr->sdn_nodeaddrl) != 2))
738	738	return -EINVAL;
739	739
740		- if (dn_ntohs(saddr->sdn_objnamel) > DN_MAXOBJL)
	740	+ if (le16_to_cpu(saddr->sdn_objnamel) > DN_MAXOBJL)
741	741	return -EINVAL;
742	742
743	743	if (saddr->sdn_flags & ~SDF_WILD)
...	...	@@ -748,7 +748,7 @@
748	748	return -EACCES;
749	749
750	750	if (!(saddr->sdn_flags & SDF_WILD)) {
751		- if (dn_ntohs(saddr->sdn_nodeaddrl)) {
	751	+ if (le16_to_cpu(saddr->sdn_nodeaddrl)) {
752	752	read_lock(&dev_base_lock);
753	753	ldev = NULL;
754	754	for_each_netdev(&init_net, dev) {
755	755
...	...	@@ -799,15 +799,15 @@
799	799	if ((scp->accessdata.acc_accl != 0) &&
800	800	(scp->accessdata.acc_accl <= 12)) {
801	801
802		- scp->addr.sdn_objnamel = dn_htons(scp->accessdata.acc_accl);
803		- memcpy(scp->addr.sdn_objname, scp->accessdata.acc_acc, dn_ntohs(scp->addr.sdn_objnamel));
	802	+ scp->addr.sdn_objnamel = cpu_to_le16(scp->accessdata.acc_accl);
	803	+ memcpy(scp->addr.sdn_objname, scp->accessdata.acc_acc, le16_to_cpu(scp->addr.sdn_objnamel));
804	804
805	805	scp->accessdata.acc_accl = 0;
806	806	memset(scp->accessdata.acc_acc, 0, 40);
807	807	}
808	808	/* End of compatibility stuff */
809	809
810		- scp->addr.sdn_add.a_len = dn_htons(2);
	810	+ scp->addr.sdn_add.a_len = cpu_to_le16(2);
811	811	rv = dn_dev_bind_default((__le16 *)scp->addr.sdn_add.a_addr);
812	812	if (rv == 0) {
813	813	rv = dn_hash_sock(sk);
...	...	@@ -1027,7 +1027,7 @@
1027	1027	u16 len = ptr++; / yes, it's 8bit on the wire */
1028	1028
1029	1029	BUG_ON(len > 16); /* we've checked the contents earlier */
1030		- opt->opt_optl = dn_htons(len);
	1030	+ opt->opt_optl = cpu_to_le16(len);
1031	1031	opt->opt_status = 0;
1032	1032	memcpy(opt->opt_data, ptr, len);
1033	1033	skb_pull(skb, len + 1);
...	...	@@ -1375,7 +1375,7 @@
1375	1375	if (optlen != sizeof(struct optdata_dn))
1376	1376	return -EINVAL;
1377	1377
1378		- if (dn_ntohs(u.opt.opt_optl) > 16)
	1378	+ if (le16_to_cpu(u.opt.opt_optl) > 16)
1379	1379	return -EINVAL;
1380	1380
1381	1381	memcpy(&scp->conndata_out, &u.opt, optlen);
...	...	@@ -1388,7 +1388,7 @@
1388	1388	if (optlen != sizeof(struct optdata_dn))
1389	1389	return -EINVAL;
1390	1390
1391		- if (dn_ntohs(u.opt.opt_optl) > 16)
	1391	+ if (le16_to_cpu(u.opt.opt_optl) > 16)
1392	1392	return -EINVAL;
1393	1393
1394	1394	memcpy(&scp->discdata_out, &u.opt, optlen);
1395	1395
...	...	@@ -2213,12 +2213,12 @@
2213	2213	{
2214	2214	int i;
2215	2215
2216		- switch (dn_ntohs(dn->sdn_objnamel)) {
	2216	+ switch (le16_to_cpu(dn->sdn_objnamel)) {
2217	2217	case 0:
2218	2218	sprintf(buf, "%d", dn->sdn_objnum);
2219	2219	break;
2220	2220	default:
2221		- for (i = 0; i < dn_ntohs(dn->sdn_objnamel); i++) {
	2221	+ for (i = 0; i < le16_to_cpu(dn->sdn_objnamel); i++) {
2222	2222	buf[i] = dn->sdn_objname[i];
2223	2223	if (IS_NOT_PRINTABLE(buf[i]))
2224	2224	buf[i] = '.';
...	...	@@ -2281,7 +2281,7 @@
2281	2281	seq_printf(seq,
2282	2282	"%6s/%04X %04d:%04d %04d:%04d %01d %-16s "
2283	2283	"%6s/%04X %04d:%04d %04d:%04d %01d %-16s %4s %s\n",
2284		- dn_addr2asc(dn_ntohs(dn_saddr2dn(&scp->addr)), buf1),
	2284	+ dn_addr2asc(le16_to_cpu(dn_saddr2dn(&scp->addr)), buf1),
2285	2285	scp->addrloc,
2286	2286	scp->numdat,
2287	2287	scp->numoth,
...	...	@@ -2289,7 +2289,7 @@
2289	2289	scp->ackxmt_oth,
2290	2290	scp->flowloc_sw,
2291	2291	local_object,
2292		- dn_addr2asc(dn_ntohs(dn_saddr2dn(&scp->peer)), buf2),
	2292	+ dn_addr2asc(le16_to_cpu(dn_saddr2dn(&scp->peer)), buf2),
2293	2293	scp->addrrem,
2294	2294	scp->numdat_rcv,
2295	2295	scp->numoth_rcv,
...	...	@@ -885,7 +885,7 @@
885	885	memcpy(msg->tiver, dn_eco_version, 3);
886	886	dn_dn2eth(msg->id, ifa->ifa_local);
887	887	msg->iinfo = DN_RT_INFO_ENDN;
888		- msg->blksize = dn_htons(mtu2blksize(dev));
	888	+ msg->blksize = cpu_to_le16(mtu2blksize(dev));
889	889	msg->area = 0x00;
890	890	memset(msg->seed, 0, 8);
891	891	memcpy(msg->neighbor, dn_hiord, ETH_ALEN);
892	892
...	...	@@ -895,13 +895,13 @@
895	895	dn_dn2eth(msg->neighbor, dn->addr);
896	896	}
897	897
898		- msg->timer = dn_htons((unsigned short)dn_db->parms.t3);
	898	+ msg->timer = cpu_to_le16((unsigned short)dn_db->parms.t3);
899	899	msg->mpd = 0x00;
900	900	msg->datalen = 0x02;
901	901	memset(msg->data, 0xAA, 2);
902	902
903	903	pktlen = (__le16 *)skb_push(skb,2);
904		- *pktlen = dn_htons(skb->len - 2);
	904	+ *pktlen = cpu_to_le16(skb->len - 2);
905	905
906	906	skb_reset_network_header(skb);
907	907
...	...	@@ -929,7 +929,7 @@
929	929	if (dn->priority != dn_db->parms.priority)
930	930	return 0;
931	931
932		- if (dn_ntohs(dn->addr) < dn_ntohs(ifa->ifa_local))
	932	+ if (le16_to_cpu(dn->addr) < le16_to_cpu(ifa->ifa_local))
933	933	return 1;
934	934
935	935	return 0;
936	936
...	...	@@ -973,11 +973,11 @@
973	973	ptr += ETH_ALEN;
974	974	*ptr++ = dn_db->parms.forwarding == 1 ?
975	975	DN_RT_INFO_L1RT : DN_RT_INFO_L2RT;
976		- ((__le16 )ptr) = dn_htons(mtu2blksize(dev));
	976	+ ((__le16 )ptr) = cpu_to_le16(mtu2blksize(dev));
977	977	ptr += 2;
978	978	ptr++ = dn_db->parms.priority; / Priority */
979	979	ptr++ = 0; / Area: Reserved */
980		- ((__le16 )ptr) = dn_htons((unsigned short)dn_db->parms.t3);
	980	+ ((__le16 )ptr) = cpu_to_le16((unsigned short)dn_db->parms.t3);
981	981	ptr += 2;
982	982	ptr++ = 0; / MPD: Reserved */
983	983	i1 = ptr++;
...	...	@@ -993,7 +993,7 @@
993	993	skb_trim(skb, (27 + *i2));
994	994
995	995	pktlen = (__le16 *)skb_push(skb, 2);
996		- *pktlen = dn_htons(skb->len - 2);
	996	+ *pktlen = cpu_to_le16(skb->len - 2);
997	997
998	998	skb_reset_network_header(skb);
999	999
...	...	@@ -1401,8 +1401,8 @@
1401	1401	mtu2blksize(dev),
1402	1402	dn_db->parms.priority,
1403	1403	dn_db->parms.state, dn_db->parms.name,
1404		- dn_db->router ? dn_addr2asc(dn_ntohs((__le16 )dn_db->router->primary_key), router_buf) : "",
1405		- dn_db->peer ? dn_addr2asc(dn_ntohs((__le16 )dn_db->peer->primary_key), peer_buf) : "");
	1404	+ dn_db->router ? dn_addr2asc(le16_to_cpu((__le16 )dn_db->router->primary_key), router_buf) : "",
	1405	+ dn_db->peer ? dn_addr2asc(le16_to_cpu((__le16 )dn_db->peer->primary_key), peer_buf) : "");
1406	1406	}
1407	1407	return 0;
1408	1408	}
...	...	@@ -1445,7 +1445,7 @@
1445	1445	return;
1446	1446	}
1447	1447
1448		- decnet_address = dn_htons((addr[0] << 10) \| addr[1]);
	1448	+ decnet_address = cpu_to_le16((addr[0] << 10) \| addr[1]);
1449	1449
1450	1450	dn_dev_devices_on();
1451	1451
...	...	@@ -250,7 +250,7 @@
250	250	data = skb_push(skb, sizeof(struct dn_long_packet) + 3);
251	251	lp = (struct dn_long_packet *)(data+3);
252	252
253		- ((__le16 )data) = dn_htons(skb->len - 2);
	253	+ ((__le16 )data) = cpu_to_le16(skb->len - 2);
254	254	(data + 2) = 1 \| DN_RT_F_PF; / Padding */
255	255
256	256	lp->msgflg = DN_RT_PKT_LONG\|(cb->rt_flags&(DN_RT_F_IE\|DN_RT_F_RQR\|DN_RT_F_RTS));
...	...	@@ -294,7 +294,7 @@
294	294	}
295	295
296	296	data = skb_push(skb, sizeof(struct dn_short_packet) + 2);
297		- ((__le16 )data) = dn_htons(skb->len - 2);
	297	+ ((__le16 )data) = cpu_to_le16(skb->len - 2);
298	298	sp = (struct dn_short_packet *)(data+2);
299	299
300	300	sp->msgflg = DN_RT_PKT_SHORT\|(cb->rt_flags&(DN_RT_F_RQR\|DN_RT_F_RTS));
301	301
...	...	@@ -336,12 +336,12 @@
336	336	}
337	337
338	338	data = skb_push(skb, sizeof(struct dn_short_packet) + 2);
339		- ((__le16 )data) = dn_htons(skb->len - 2);
	339	+ ((__le16 )data) = cpu_to_le16(skb->len - 2);
340	340	sp = (struct dn_short_packet *)(data + 2);
341	341
342	342	sp->msgflg = DN_RT_PKT_SHORT\|(cb->rt_flags&(DN_RT_F_RQR\|DN_RT_F_RTS));
343		- sp->dstnode = cb->dst & dn_htons(0x03ff);
344		- sp->srcnode = cb->src & dn_htons(0x03ff);
	343	+ sp->dstnode = cb->dst & cpu_to_le16(0x03ff);
	344	+ sp->srcnode = cb->src & cpu_to_le16(0x03ff);
345	345	sp->forward = cb->hops & 0x3f;
346	346
347	347	skb_reset_network_header(skb);
...	...	@@ -394,7 +394,7 @@
394	394	if (neigh->dev->type == ARPHRD_ETHER)
395	395	memcpy(neigh->ha, &eth_hdr(skb)->h_source, ETH_ALEN);
396	396
397		- dn->blksize = dn_ntohs(msg->blksize);
	397	+ dn->blksize = le16_to_cpu(msg->blksize);
398	398	dn->priority = msg->priority;
399	399
400	400	dn->flags &= ~DN_NDFLAG_P3;
...	...	@@ -410,7 +410,7 @@
410	410	}
411	411
412	412	/* Only use routers in our area */
413		- if ((dn_ntohs(src)>>10) == (dn_ntohs((decnet_address))>>10)) {
	413	+ if ((le16_to_cpu(src)>>10) == (le16_to_cpu((decnet_address))>>10)) {
414	414	if (!dn_db->router) {
415	415	dn_db->router = neigh_clone(neigh);
416	416	} else {
...	...	@@ -453,7 +453,7 @@
453	453	if (neigh->dev->type == ARPHRD_ETHER)
454	454	memcpy(neigh->ha, &eth_hdr(skb)->h_source, ETH_ALEN);
455	455	dn->flags &= ~(DN_NDFLAG_R1 \| DN_NDFLAG_R2);
456		- dn->blksize = dn_ntohs(msg->blksize);
	456	+ dn->blksize = le16_to_cpu(msg->blksize);
457	457	dn->priority = 0;
458	458	}
459	459
...	...	@@ -543,7 +543,7 @@
543	543
544	544	read_lock(&n->lock);
545	545	seq_printf(seq, "%-7s %s%s%s %02x %02d %07ld %-8s\n",
546		- dn_addr2asc(dn_ntohs(dn->addr), buf),
	546	+ dn_addr2asc(le16_to_cpu(dn->addr), buf),
547	547	(dn->flags&DN_NDFLAG_R1) ? "1" : "-",
548	548	(dn->flags&DN_NDFLAG_R2) ? "2" : "-",
549	549	(dn->flags&DN_NDFLAG_P3) ? "3" : "-",
...	...	@@ -83,7 +83,9 @@
83	83	if (decnet_log_martians && net_ratelimit()) {
84	84	char *devname = skb->dev ? skb->dev->name : "???";
85	85	struct dn_skb_cb *cb = DN_SKB_CB(skb);
86		- 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));
	86	+ printk(KERN_INFO "DECnet: Martian packet (%s) dev=%s src=0x%04hx dst=0x%04hx srcport=0x%04hx dstport=0x%04hx\n",
	87	+ msg, devname, le16_to_cpu(cb->src), le16_to_cpu(cb->dst),
	88	+ le16_to_cpu(cb->src_port), le16_to_cpu(cb->dst_port));
87	89	}
88	90	}
89	91
...	...	@@ -133,7 +135,7 @@
133	135	if (skb->len < 2)
134	136	return len;
135	137
136		- if ((ack = dn_ntohs(*ptr)) & 0x8000) {
	138	+ if ((ack = le16_to_cpu(*ptr)) & 0x8000) {
137	139	skb_pull(skb, 2);
138	140	ptr++;
139	141	len += 2;
...	...	@@ -147,7 +149,7 @@
147	149	if (skb->len < 2)
148	150	return len;
149	151
150		- if ((ack = dn_ntohs(*ptr)) & 0x8000) {
	152	+ if ((ack = le16_to_cpu(*ptr)) & 0x8000) {
151	153	skb_pull(skb, 2);
152	154	len += 2;
153	155	if ((ack & 0x4000) == 0) {
...	...	@@ -237,7 +239,7 @@
237	239	cb->dst_port = msg->dstaddr;
238	240	cb->services = msg->services;
239	241	cb->info = msg->info;
240		- cb->segsize = dn_ntohs(msg->segsize);
	242	+ cb->segsize = le16_to_cpu(msg->segsize);
241	243
242	244	if (!pskb_may_pull(skb, sizeof(*msg)))
243	245	goto err_out;
...	...	@@ -344,7 +346,7 @@
344	346	ptr = skb->data;
345	347	cb->services = *ptr++;
346	348	cb->info = *ptr++;
347		- cb->segsize = dn_ntohs((__le16 )ptr);
	349	+ cb->segsize = le16_to_cpu((__le16 )ptr);
348	350
349	351	if ((scp->state == DN_CI) \|\| (scp->state == DN_CD)) {
350	352	scp->persist = 0;
...	...	@@ -361,7 +363,7 @@
361	363	if (skb->len > 0) {
362	364	u16 dlen = *skb->data;
363	365	if ((dlen <= 16) && (dlen <= skb->len)) {
364		- scp->conndata_in.opt_optl = dn_htons(dlen);
	366	+ scp->conndata_in.opt_optl = cpu_to_le16(dlen);
365	367	skb_copy_from_linear_data_offset(skb, 1,
366	368	scp->conndata_in.opt_data, dlen);
367	369	}
368	370
369	371
...	...	@@ -396,17 +398,17 @@
396	398	if (skb->len < 2)
397	399	goto out;
398	400
399		- reason = dn_ntohs((__le16 )skb->data);
	401	+ reason = le16_to_cpu((__le16 )skb->data);
400	402	skb_pull(skb, 2);
401	403
402		- scp->discdata_in.opt_status = dn_htons(reason);
	404	+ scp->discdata_in.opt_status = cpu_to_le16(reason);
403	405	scp->discdata_in.opt_optl = 0;
404	406	memset(scp->discdata_in.opt_data, 0, 16);
405	407
406	408	if (skb->len > 0) {
407	409	u16 dlen = *skb->data;
408	410	if ((dlen <= 16) && (dlen <= skb->len)) {
409		- scp->discdata_in.opt_optl = dn_htons(dlen);
	411	+ scp->discdata_in.opt_optl = cpu_to_le16(dlen);
410	412	skb_copy_from_linear_data_offset(skb, 1, scp->discdata_in.opt_data, dlen);
411	413	}
412	414	}
...	...	@@ -463,7 +465,7 @@
463	465	if (skb->len != 2)
464	466	goto out;
465	467
466		- reason = dn_ntohs((__le16 )skb->data);
	468	+ reason = le16_to_cpu((__le16 )skb->data);
467	469
468	470	sk->sk_state = TCP_CLOSE;
469	471
...	...	@@ -512,7 +514,7 @@
512	514	if (skb->len != 4)
513	515	goto out;
514	516
515		- segnum = dn_ntohs((__le16 )ptr);
	517	+ segnum = le16_to_cpu((__le16 )ptr);
516	518	ptr += 2;
517	519	lsflags = (unsigned char )ptr++;
518	520	fcval = *ptr;
...	...	@@ -620,7 +622,7 @@
620	622	if (skb->len < 2)
621	623	goto out;
622	624
623		- cb->segnum = segnum = dn_ntohs((__le16 )skb->data);
	625	+ cb->segnum = segnum = le16_to_cpu((__le16 )skb->data);
624	626	skb_pull(skb, 2);
625	627
626	628	if (seq_next(scp->numoth_rcv, segnum)) {
...	...	@@ -648,7 +650,7 @@
648	650	if (skb->len < 2)
649	651	goto out;
650	652
651		- cb->segnum = segnum = dn_ntohs((__le16 )skb->data);
	653	+ cb->segnum = segnum = le16_to_cpu((__le16 )skb->data);
652	654	skb_pull(skb, 2);
653	655
654	656	if (seq_next(scp->numdat_rcv, segnum)) {
...	...	@@ -325,8 +325,8 @@
325	325
326	326	ptr = (__le16 *)dn_mk_common_header(scp, skb, msgflag, hlen);
327	327
328		- *ptr++ = dn_htons(acknum);
329		- *ptr++ = dn_htons(ackcrs);
	328	+ *ptr++ = cpu_to_le16(acknum);
	329	+ *ptr++ = cpu_to_le16(ackcrs);
330	330
331	331	return ptr;
332	332	}
...	...	@@ -344,7 +344,7 @@
344	344	cb->segnum = scp->numdat;
345	345	seq_add(&scp->numdat, 1);
346	346	}
347		- *(ptr++) = dn_htons(cb->segnum);
	347	+ *(ptr++) = cpu_to_le16(cb->segnum);
348	348
349	349	return ptr;
350	350	}
...	...	@@ -522,7 +522,7 @@
522	522	struct dn_scp *scp = DN_SK(sk);
523	523	struct sk_buff *skb = NULL;
524	524	struct nsp_conn_init_msg *msg;
525		- __u8 len = (__u8)dn_ntohs(scp->conndata_out.opt_optl);
	525	+ __u8 len = (__u8)le16_to_cpu(scp->conndata_out.opt_optl);
526	526
527	527	if ((skb = dn_alloc_skb(sk, 50 + len, gfp)) == NULL)
528	528	return;
...	...	@@ -533,7 +533,7 @@
533	533	msg->srcaddr = scp->addrloc;
534	534	msg->services = scp->services_loc;
535	535	msg->info = scp->info_loc;
536		- msg->segsize = dn_htons(scp->segsize_loc);
	536	+ msg->segsize = cpu_to_le16(scp->segsize_loc);
537	537
538	538	*skb_put(skb,1) = len;
539	539
...	...	@@ -559,7 +559,7 @@
559	559
560	560	if ((dst == NULL) \|\| (rem == 0)) {
561	561	if (net_ratelimit())
562		- 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);
	562	+ printk(KERN_DEBUG "DECnet: dn_nsp_do_disc: BUG! Please report this to SteveW@ACM.org rem=%u dst=%p\n", le16_to_cpu(rem), dst);
563	563	return;
564	564	}
565	565
...	...	@@ -572,7 +572,7 @@
572	572	msg += 2;
573	573	(__le16 )msg = loc;
574	574	msg += 2;
575		- (__le16 )msg = dn_htons(reason);
	575	+ (__le16 )msg = cpu_to_le16(reason);
576	576	msg += 2;
577	577	if (msgflg == NSP_DISCINIT)
578	578	*msg++ = ddl;
579	579
...	...	@@ -598,10 +598,10 @@
598	598	int ddl = 0;
599	599
600	600	if (msgflg == NSP_DISCINIT)
601		- ddl = dn_ntohs(scp->discdata_out.opt_optl);
	601	+ ddl = le16_to_cpu(scp->discdata_out.opt_optl);
602	602
603	603	if (reason == 0)
604		- reason = dn_ntohs(scp->discdata_out.opt_status);
	604	+ reason = le16_to_cpu(scp->discdata_out.opt_status);
605	605
606	606	dn_nsp_do_disc(sk, msgflg, reason, gfp, sk->sk_dst_cache, ddl,
607	607	scp->discdata_out.opt_data, scp->addrrem, scp->addrloc);
...	...	@@ -675,7 +675,7 @@
675	675	msg->srcaddr = scp->addrloc;
676	676	msg->services = scp->services_loc; /* Requested flow control */
677	677	msg->info = scp->info_loc; /* Version Number */
678		- msg->segsize = dn_htons(scp->segsize_loc); /* Max segment size */
	678	+ msg->segsize = cpu_to_le16(scp->segsize_loc); /* Max segment size */
679	679
680	680	if (scp->peer.sdn_objnum)
681	681	type = 0;
...	...	@@ -708,7 +708,7 @@
708	708	if (aux > 0)
709	709	memcpy(skb_put(skb, aux), scp->accessdata.acc_acc, aux);
710	710
711		- aux = (__u8)dn_ntohs(scp->conndata_out.opt_optl);
	711	+ aux = (__u8)le16_to_cpu(scp->conndata_out.opt_optl);
712	712	*skb_put(skb, 1) = aux;
713	713	if (aux > 0)
714	714	memcpy(skb_put(skb,aux), scp->conndata_out.opt_data, aux);
...	...	@@ -475,7 +475,7 @@
475	475	printk(KERN_DEBUG
476	476	"DECnet: dn_route_rx_packet: rt_flags=0x%02x dev=%s len=%d src=0x%04hx dst=0x%04hx err=%d type=%d\n",
477	477	(int)cb->rt_flags, devname, skb->len,
478		- dn_ntohs(cb->src), dn_ntohs(cb->dst),
	478	+ le16_to_cpu(cb->src), le16_to_cpu(cb->dst),
479	479	err, skb->pkt_type);
480	480	}
481	481
...	...	@@ -575,7 +575,7 @@
575	575	{
576	576	struct dn_skb_cb *cb;
577	577	unsigned char flags = 0;
578		- __u16 len = dn_ntohs((__le16 )skb->data);
	578	+ __u16 len = le16_to_cpu((__le16 )skb->data);
579	579	struct dn_dev dn = (struct dn_dev )dev->dn_ptr;
580	580	unsigned char padlen = 0;
581	581
...	...	@@ -773,7 +773,7 @@
773	773	struct dn_skb_cb *cb = DN_SKB_CB(skb);
774	774
775	775	printk(KERN_DEBUG "dn_rt_bug: skb from:%04x to:%04x\n",
776		- dn_ntohs(cb->src), dn_ntohs(cb->dst));
	776	+ le16_to_cpu(cb->src), le16_to_cpu(cb->dst));
777	777	}
778	778
779	779	kfree_skb(skb);
...	...	@@ -816,7 +816,7 @@
816	816
817	817	static inline int dn_match_addr(__le16 addr1, __le16 addr2)
818	818	{
819		- __u16 tmp = dn_ntohs(addr1) ^ dn_ntohs(addr2);
	819	+ __u16 tmp = le16_to_cpu(addr1) ^ le16_to_cpu(addr2);
820	820	int match = 16;
821	821	while(tmp) {
822	822	tmp >>= 1;
...	...	@@ -886,8 +886,8 @@
886	886	if (decnet_debug_level & 16)
887	887	printk(KERN_DEBUG
888	888	"dn_route_output_slow: dst=%04x src=%04x mark=%d"
889		- " iif=%d oif=%d\n", dn_ntohs(oldflp->fld_dst),
890		- dn_ntohs(oldflp->fld_src),
	889	+ " iif=%d oif=%d\n", le16_to_cpu(oldflp->fld_dst),
	890	+ le16_to_cpu(oldflp->fld_src),
891	891	oldflp->mark, init_net.loopback_dev->ifindex, oldflp->oif);
892	892
893	893	/* If we have an output interface, verify its a DECnet device */
...	...	@@ -959,7 +959,7 @@
959	959	printk(KERN_DEBUG
960	960	"dn_route_output_slow: initial checks complete."
961	961	" dst=%o4x src=%04x oif=%d try_hard=%d\n",
962		- dn_ntohs(fl.fld_dst), dn_ntohs(fl.fld_src),
	962	+ le16_to_cpu(fl.fld_dst), le16_to_cpu(fl.fld_src),
963	963	fl.oif, try_hard);
964	964
965	965	/*
...	...	@@ -1711,8 +1711,8 @@
1711	1711
1712	1712	seq_printf(seq, "%-8s %-7s %-7s %04d %04d %04d\n",
1713	1713	rt->u.dst.dev ? rt->u.dst.dev->name : "*",
1714		- dn_addr2asc(dn_ntohs(rt->rt_daddr), buf1),
1715		- dn_addr2asc(dn_ntohs(rt->rt_saddr), buf2),
	1714	+ dn_addr2asc(le16_to_cpu(rt->rt_daddr), buf1),
	1715	+ dn_addr2asc(le16_to_cpu(rt->rt_saddr), buf2),
1716	1716	atomic_read(&rt->u.dst.__refcnt),
1717	1717	rt->u.dst.__use,
1718	1718	(int) dst_metric(&rt->u.dst, RTAX_RTT));
...	...	@@ -85,7 +85,7 @@
85	85
86	86	static inline dn_fib_idx_t dn_hash(dn_fib_key_t key, struct dn_zone *dz)
87	87	{
88		- u16 h = dn_ntohs(key.datum)>>(16 - dz->dz_order);
	88	+ u16 h = le16_to_cpu(key.datum)>>(16 - dz->dz_order);
89	89	h ^= (h >> 10);
90	90	h ^= (h >> 6);
91	91	h &= DZ_HASHMASK(dz);
...	...	@@ -126,7 +126,7 @@
126	126	if (INVALID_END_CHAR(*str))
127	127	return -1;
128	128
129		- *addr = dn_htons((area << 10) \| node);
	129	+ *addr = cpu_to_le16((area << 10) \| node);
130	130
131	131	return 0;
132	132	}
...	...	@@ -201,7 +201,7 @@
201	201	return 0;
202	202	}
203	203
204		- dn_addr2asc(dn_ntohs(decnet_address), addr);
	204	+ dn_addr2asc(le16_to_cpu(decnet_address), addr);
205	205	len = strlen(addr);
206	206	addr[len++] = '\n';
207	207