Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit ae445d172ab4d342a0a9d64df499cca8d5ad61b3

Authored by YOSHIFUJI Hideaki
Committed by David S. Miller
1 parent f831e90971
Exists in master and in 7 other branches imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-l5.0.0_1.0.0-ga

[RXRPC]: Use cpu_to_be32() where appropriate. 

Signed-off-by: YOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org>
Signed-off-by: David S. Miller <davem@davemloft.net>

Showing 3 changed files with 5 additions and 5 deletions Side-by-side Diff

net/rxrpc/ar-connection.c
Diff comments   View file @ ae445d1
... ... @@ -651,7 +651,7 @@
651 651  
652 652 candidate->trans = trans;
653 653 candidate->epoch = hdr->epoch;
654   - candidate->cid = hdr->cid & __constant_cpu_to_be32(RXRPC_CIDMASK);
  654 + candidate->cid = hdr->cid & cpu_to_be32(RXRPC_CIDMASK);
655 655 candidate->service_id = hdr->serviceId;
656 656 candidate->security_ix = hdr->securityIndex;
657 657 candidate->in_clientflag = RXRPC_CLIENT_INITIATED;
net/rxrpc/ar-input.c
Diff comments   View file @ ae445d1
... ... @@ -595,7 +595,7 @@
595 595 read_unlock_bh(&conn->lock);
596 596  
597 597 if (sp->hdr.flags & RXRPC_CLIENT_INITIATED &&
598   - sp->hdr.seq == __constant_cpu_to_be32(1)) {
  598 + sp->hdr.seq == cpu_to_be32(1)) {
599 599 _debug("incoming call");
600 600 skb_queue_tail(&conn->trans->local->accept_queue, skb);
601 601 rxrpc_queue_work(&conn->trans->local->acceptor);
... ... @@ -774,7 +774,7 @@
774 774 _debug("can't route call");
775 775 if (sp->hdr.flags & RXRPC_CLIENT_INITIATED &&
776 776 sp->hdr.type == RXRPC_PACKET_TYPE_DATA) {
777   - if (sp->hdr.seq == __constant_cpu_to_be32(1)) {
  777 + if (sp->hdr.seq == cpu_to_be32(1)) {
778 778 _debug("first packet");
779 779 skb_queue_tail(&local->accept_queue, skb);
780 780 rxrpc_queue_work(&local->acceptor);
... ... @@ -284,7 +284,7 @@
284 284  
285 285 /* calculate the security checksum */
286 286 x = htonl(call->channel << (32 - RXRPC_CIDSHIFT));
287   - x |= sp->hdr.seq & __constant_cpu_to_be32(0x3fffffff);
  287 + x |= sp->hdr.seq & cpu_to_be32(0x3fffffff);
288 288 tmpbuf.x[0] = sp->hdr.callNumber;
289 289 tmpbuf.x[1] = x;
290 290  
... ... @@ -518,7 +518,7 @@
518 518  
519 519 /* validate the security checksum */
520 520 x = htonl(call->channel << (32 - RXRPC_CIDSHIFT));
521   - x |= sp->hdr.seq & __constant_cpu_to_be32(0x3fffffff);
  521 + x |= sp->hdr.seq & cpu_to_be32(0x3fffffff);
522 522 tmpbuf.x[0] = call->call_id;
523 523 tmpbuf.x[1] = x;
524 524