aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorYOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org>2007-12-11 13:55:22 -0500
committerDavid S. Miller <davem@davemloft.net>2008-01-28 17:58:04 -0500
commitae445d172ab4d342a0a9d64df499cca8d5ad61b3 (patch)
treec6c81b9495920ac7b4766126c4f2c77c5db41d91
parentf831e90971dc942a9f2fcc918a5739eb6d4ef4c5 (diff)
[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>
-rw-r--r--net/rxrpc/ar-connection.c2
-rw-r--r--net/rxrpc/ar-input.c4
-rw-r--r--net/rxrpc/rxkad.c4
3 files changed, 5 insertions, 5 deletions
diff --git a/net/rxrpc/ar-connection.c b/net/rxrpc/ar-connection.c
index d6667f7bc85e..3869a5866752 100644
--- a/net/rxrpc/ar-connection.c
+++ b/net/rxrpc/ar-connection.c
@@ -651,7 +651,7 @@ rxrpc_incoming_connection(struct rxrpc_transport *trans,
651 651
652 candidate->trans = trans; 652 candidate->trans = trans;
653 candidate->epoch = hdr->epoch; 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 candidate->service_id = hdr->serviceId; 655 candidate->service_id = hdr->serviceId;
656 candidate->security_ix = hdr->securityIndex; 656 candidate->security_ix = hdr->securityIndex;
657 candidate->in_clientflag = RXRPC_CLIENT_INITIATED; 657 candidate->in_clientflag = RXRPC_CLIENT_INITIATED;
diff --git a/net/rxrpc/ar-input.c b/net/rxrpc/ar-input.c
index f446d9b9925f..f8a699e92962 100644
--- a/net/rxrpc/ar-input.c
+++ b/net/rxrpc/ar-input.c
@@ -595,7 +595,7 @@ dead_call:
595 read_unlock_bh(&conn->lock); 595 read_unlock_bh(&conn->lock);
596 596
597 if (sp->hdr.flags & RXRPC_CLIENT_INITIATED && 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 _debug("incoming call"); 599 _debug("incoming call");
600 skb_queue_tail(&conn->trans->local->accept_queue, skb); 600 skb_queue_tail(&conn->trans->local->accept_queue, skb);
601 rxrpc_queue_work(&conn->trans->local->acceptor); 601 rxrpc_queue_work(&conn->trans->local->acceptor);
@@ -774,7 +774,7 @@ cant_route_call:
774 _debug("can't route call"); 774 _debug("can't route call");
775 if (sp->hdr.flags & RXRPC_CLIENT_INITIATED && 775 if (sp->hdr.flags & RXRPC_CLIENT_INITIATED &&
776 sp->hdr.type == RXRPC_PACKET_TYPE_DATA) { 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 _debug("first packet"); 778 _debug("first packet");
779 skb_queue_tail(&local->accept_queue, skb); 779 skb_queue_tail(&local->accept_queue, skb);
780 rxrpc_queue_work(&local->acceptor); 780 rxrpc_queue_work(&local->acceptor);
diff --git a/net/rxrpc/rxkad.c b/net/rxrpc/rxkad.c
index 8e69d6993833..f48434adb7c2 100644
--- a/net/rxrpc/rxkad.c
+++ b/net/rxrpc/rxkad.c
@@ -284,7 +284,7 @@ static int rxkad_secure_packet(const struct rxrpc_call *call,
284 284
285 /* calculate the security checksum */ 285 /* calculate the security checksum */
286 x = htonl(call->channel << (32 - RXRPC_CIDSHIFT)); 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 tmpbuf.x[0] = sp->hdr.callNumber; 288 tmpbuf.x[0] = sp->hdr.callNumber;
289 tmpbuf.x[1] = x; 289 tmpbuf.x[1] = x;
290 290
@@ -518,7 +518,7 @@ static int rxkad_verify_packet(const struct rxrpc_call *call,
518 518
519 /* validate the security checksum */ 519 /* validate the security checksum */
520 x = htonl(call->channel << (32 - RXRPC_CIDSHIFT)); 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 tmpbuf.x[0] = call->call_id; 522 tmpbuf.x[0] = call->call_id;
523 tmpbuf.x[1] = x; 523 tmpbuf.x[1] = x;
524 524