Commit c4106aa8 authored by Harvey Harrison's avatar Harvey Harrison Committed by David S. Miller
Browse files

decnet: remove private wrappers of endian helpers 



Signed-off-by: default avatarHarvey Harrison <harvey.harrison@gmail.com>
Reviewed-by: default avatarSteven Whitehouse <swhiteho@redhat.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 5b9ab2ec

include/net/dn.h

+3 −5
Original line number Diff line number Diff line
@@ -4,9 +4,7 @@ 
#include <linux/dn.h>

#include <net/sock.h>

#include <asm/byteorder.h>



#define dn_ntohs(x) le16_to_cpu(x)

#define dn_htons(x) cpu_to_le16(x)

#include <asm/unalignedh>



struct dn_scp                                   /* Session Control Port */

{
@@ -175,7 +173,7 @@ struct dn_skb_cb { 


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 __le16 dn_saddr2dn(struct sockaddr_dn *saddr) 


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;

include/net/dn_fib.h

+3 −3
Original line number Diff line number Diff line
@@ -182,8 +182,8 @@ static inline void dn_fib_res_put(struct dn_fib_res *res) 
static inline __le16 dnet_make_mask(int n)

{

	if (n)

                return dn_htons(~((1<<(16-n))-1));

        return 0;

		return cpu_to_le16(~((1 << (16 - n)) - 1));

	return cpu_to_le16(0);

}



#endif /* _NET_DN_FIB_H */

net/decnet/af_decnet.c

+31 −31
Original line number Diff line number Diff line
@@ -167,7 +167,7 @@ static struct hlist_head *dn_find_list(struct sock *sk) 
	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 @@ static int check_port(__le16 port) 
	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_alloc(struct sock *sk) 
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 @@ static struct hlist_head *listen_hash(struct sockaddr_dn *addr) 


	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 @@ int dn_sockaddr2username(struct sockaddr_dn *sdn, unsigned char *buf, unsigned c 
			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 dn_username2sockaddr(unsigned char *data, int len, struct sockaddr_dn *sdn, 
	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 @@ int dn_username2sockaddr(unsigned char *data, int len, struct sockaddr_dn *sdn, 
	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 @@ struct sock *dn_sklist_find_listener(struct sockaddr_dn *addr) 
				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 sock *dn_find_by_skb(struct sk_buff *skb) 
	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 @@ static int dn_bind(struct socket *sock, struct sockaddr *uaddr, int addr_len) 
	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 @@ static int dn_bind(struct socket *sock, struct sockaddr *uaddr, int addr_len) 
		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 @@ static int dn_auto_bind(struct socket *sock) 
	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 @@ static void dn_user_copy(struct sk_buff *skb, struct optdata_dn *opt) 
	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 @@ static int __dn_setsockopt(struct socket *sock, int level,int optname, char __us 
			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 @@ static int __dn_setsockopt(struct socket *sock, int level,int optname, char __us 
			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 @@ static void dn_printable_object(struct sockaddr_dn *dn, unsigned char *buf) 
{

	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 @@ static inline void dn_socket_format_entry(struct seq_file *seq, struct sock *sk) 
	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 @@ static inline void dn_socket_format_entry(struct seq_file *seq, struct sock *sk) 
		   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,

net/decnet/dn_dev.c

+10 −10
Original line number Diff line number Diff line
@@ -885,7 +885,7 @@ static void dn_send_endnode_hello(struct net_device *dev, struct dn_ifaddr *ifa) 
	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 @@ static void dn_send_endnode_hello(struct net_device *dev, struct dn_ifaddr *ifa) 
		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 @@ static int dn_am_i_a_router(struct dn_neigh *dn, struct dn_dev *dn_db, struct dn 
	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 @@ 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;

	*((__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 @@ static void dn_send_router_hello(struct net_device *dev, struct dn_ifaddr *ifa) 
	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 @@ 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(*(__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 @@ void __init dn_dev_init(void) 
		return;

	}



	decnet_address = dn_htons((addr[0] << 10) | addr[1]);

	decnet_address = cpu_to_le16((addr[0] << 10) | addr[1]);



	dn_dev_devices_on();

net/decnet/dn_neigh.c

+9 −9
Original line number Diff line number Diff line
@@ -250,7 +250,7 @@ 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);



	*((__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 @@ static int dn_short_output(struct sk_buff *skb) 
	}



	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 @@ static int dn_phase3_output(struct sk_buff *skb) 
	}



	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 @@ int dn_neigh_router_hello(struct sk_buff *skb) 
			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 @@ 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 ((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 @@ int dn_neigh_endnode_hello(struct sk_buff *skb) 
			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 @@ static inline void dn_neigh_format_entry(struct seq_file *seq, 


	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" : "-",