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>
This commit is contained in:

committed by
David S. Miller

parent
5b9ab2ec04
commit
c4106aa88a
@@ -325,8 +325,8 @@ static __le16 *dn_mk_ack_header(struct sock *sk, struct sk_buff *skb, unsigned c
|
||||
|
||||
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 @@ static __le16 *dn_nsp_mk_data_header(struct sock *sk, struct sk_buff *skb, int o
|
||||
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 @@ 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;
|
||||
__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 @@ void dn_send_conn_conf(struct sock *sk, gfp_t gfp)
|
||||
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 @@ 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", 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 @@ static __inline__ void dn_nsp_do_disc(struct sock *sk, unsigned char msgflg,
|
||||
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 @@ void dn_nsp_send_disc(struct sock *sk, unsigned char msgflg,
|
||||
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 @@ void dn_nsp_send_conninit(struct sock *sk, unsigned char msgflg)
|
||||
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 @@ 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 = (__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);
|
||||
|
Reference in New Issue
Block a user