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,
 
         candidate->trans = trans;
         candidate->epoch = hdr->epoch;
-        candidate->cid = hdr->cid & __constant_cpu_to_be32(RXRPC_CIDMASK);
+        candidate->cid = hdr->cid & cpu_to_be32(RXRPC_CIDMASK);
         candidate->service_id = hdr->serviceId;
         candidate->security_ix = hdr->securityIndex;
         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:
         read_unlock_bh(&conn->lock);
 
         if (sp->hdr.flags & RXRPC_CLIENT_INITIATED &&
-            sp->hdr.seq == __constant_cpu_to_be32(1)) {
+            sp->hdr.seq == cpu_to_be32(1)) {
                 _debug("incoming call");
                 skb_queue_tail(&conn->trans->local->accept_queue, skb);
                 rxrpc_queue_work(&conn->trans->local->acceptor);
@@ -774,7 +774,7 @@ cant_route_call:
         _debug("can't route call");
         if (sp->hdr.flags & RXRPC_CLIENT_INITIATED &&
             sp->hdr.type == RXRPC_PACKET_TYPE_DATA) {
-                if (sp->hdr.seq == __constant_cpu_to_be32(1)) {
+                if (sp->hdr.seq == cpu_to_be32(1)) {
                         _debug("first packet");
                         skb_queue_tail(&local->accept_queue, skb);
                         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,
 
         /* calculate the security checksum */
         x = htonl(call->channel << (32 - RXRPC_CIDSHIFT));
-        x |= sp->hdr.seq & __constant_cpu_to_be32(0x3fffffff);
+        x |= sp->hdr.seq & cpu_to_be32(0x3fffffff);
         tmpbuf.x[0] = sp->hdr.callNumber;
         tmpbuf.x[1] = x;
 
@@ -518,7 +518,7 @@ static int rxkad_verify_packet(const struct rxrpc_call *call,
 
         /* validate the security checksum */
         x = htonl(call->channel << (32 - RXRPC_CIDSHIFT));
-        x |= sp->hdr.seq & __constant_cpu_to_be32(0x3fffffff);
+        x |= sp->hdr.seq & cpu_to_be32(0x3fffffff);
         tmpbuf.x[0] = call->call_id;
         tmpbuf.x[1] = x;