3 files changed, 25 insertions, 25 deletions

diff --git a/include/rdma/ib_cm.h b/include/rdma/ib_cm.h
index ec7c6d99ed3f..938858304300 100644
--- a/include/rdma/ib_cm.h
+++ b/include/rdma/ib_cm.h
@@ -314,12 +314,12 @@ struct ib_cm_id *ib_create_cm_id(struct ib_device *device,
  */
 void ib_destroy_cm_id(struct ib_cm_id *cm_id);
 
-#define IB_SERVICE_ID_AGN_MASK  __constant_cpu_to_be64(0xFF00000000000000ULL)
-#define IB_CM_ASSIGN_SERVICE_ID __constant_cpu_to_be64(0x0200000000000000ULL)
-#define IB_CMA_SERVICE_ID       __constant_cpu_to_be64(0x0000000001000000ULL)
-#define IB_CMA_SERVICE_ID_MASK  __constant_cpu_to_be64(0xFFFFFFFFFF000000ULL)
-#define IB_SDP_SERVICE_ID       __constant_cpu_to_be64(0x0000000000010000ULL)
-#define IB_SDP_SERVICE_ID_MASK  __constant_cpu_to_be64(0xFFFFFFFFFFFF0000ULL)
+#define IB_SERVICE_ID_AGN_MASK  cpu_to_be64(0xFF00000000000000ULL)
+#define IB_CM_ASSIGN_SERVICE_ID cpu_to_be64(0x0200000000000000ULL)
+#define IB_CMA_SERVICE_ID       cpu_to_be64(0x0000000001000000ULL)
+#define IB_CMA_SERVICE_ID_MASK  cpu_to_be64(0xFFFFFFFFFF000000ULL)
+#define IB_SDP_SERVICE_ID       cpu_to_be64(0x0000000000010000ULL)
+#define IB_SDP_SERVICE_ID_MASK  cpu_to_be64(0xFFFFFFFFFFFF0000ULL)
 
 struct ib_cm_compare_data {
         u8  data[IB_CM_COMPARE_SIZE];
diff --git a/include/rdma/ib_mad.h b/include/rdma/ib_mad.h
index 5f6c40fffcf4..d3b9401b77b0 100644
--- a/include/rdma/ib_mad.h
+++ b/include/rdma/ib_mad.h
@@ -107,7 +107,7 @@
 #define IB_MGMT_RMPP_STATUS_ABORT_MAX           127
 
 #define IB_QP0          0
-#define IB_QP1          __constant_htonl(1)
+#define IB_QP1          cpu_to_be32(1)
 #define IB_QP1_QKEY     0x80010000
 #define IB_QP_SET_QKEY  0x80000000
 
@@ -290,7 +290,7 @@ static inline void ib_set_rmpp_resptime(struct ib_rmpp_hdr *rmpp_hdr, u8 rtime)
  */
 static inline void ib_set_rmpp_flags(struct ib_rmpp_hdr *rmpp_hdr, u8 flags)
 {
-        rmpp_hdr->rmpp_rtime_flags = (rmpp_hdr->rmpp_rtime_flags & 0xF1) |
+        rmpp_hdr->rmpp_rtime_flags = (rmpp_hdr->rmpp_rtime_flags & 0xF8) |
                                      (flags & 0x7);
 }
 
diff --git a/include/rdma/ib_smi.h b/include/rdma/ib_smi.h
index aaca0878668f..98b9086d769a 100644
--- a/include/rdma/ib_smi.h
+++ b/include/rdma/ib_smi.h
@@ -63,25 +63,25 @@ struct ib_smp {
         u8      return_path[IB_SMP_MAX_PATH_HOPS];
 } __attribute__ ((packed));
 
-#define IB_SMP_DIRECTION                        __constant_htons(0x8000)
+#define IB_SMP_DIRECTION                        cpu_to_be16(0x8000)
 
 /* Subnet management attributes */
-#define IB_SMP_ATTR_NOTICE                      __constant_htons(0x0002)
-#define IB_SMP_ATTR_NODE_DESC                   __constant_htons(0x0010)
-#define IB_SMP_ATTR_NODE_INFO                   __constant_htons(0x0011)
-#define IB_SMP_ATTR_SWITCH_INFO                 __constant_htons(0x0012)
-#define IB_SMP_ATTR_GUID_INFO                   __constant_htons(0x0014)
-#define IB_SMP_ATTR_PORT_INFO                   __constant_htons(0x0015)
-#define IB_SMP_ATTR_PKEY_TABLE                  __constant_htons(0x0016)
-#define IB_SMP_ATTR_SL_TO_VL_TABLE              __constant_htons(0x0017)
-#define IB_SMP_ATTR_VL_ARB_TABLE                __constant_htons(0x0018)
-#define IB_SMP_ATTR_LINEAR_FORWARD_TABLE        __constant_htons(0x0019)
-#define IB_SMP_ATTR_RANDOM_FORWARD_TABLE        __constant_htons(0x001A)
-#define IB_SMP_ATTR_MCAST_FORWARD_TABLE         __constant_htons(0x001B)
-#define IB_SMP_ATTR_SM_INFO                     __constant_htons(0x0020)
-#define IB_SMP_ATTR_VENDOR_DIAG                 __constant_htons(0x0030)
-#define IB_SMP_ATTR_LED_INFO                    __constant_htons(0x0031)
-#define IB_SMP_ATTR_VENDOR_MASK                 __constant_htons(0xFF00)
+#define IB_SMP_ATTR_NOTICE                      cpu_to_be16(0x0002)
+#define IB_SMP_ATTR_NODE_DESC                   cpu_to_be16(0x0010)
+#define IB_SMP_ATTR_NODE_INFO                   cpu_to_be16(0x0011)
+#define IB_SMP_ATTR_SWITCH_INFO                 cpu_to_be16(0x0012)
+#define IB_SMP_ATTR_GUID_INFO                   cpu_to_be16(0x0014)
+#define IB_SMP_ATTR_PORT_INFO                   cpu_to_be16(0x0015)
+#define IB_SMP_ATTR_PKEY_TABLE                  cpu_to_be16(0x0016)
+#define IB_SMP_ATTR_SL_TO_VL_TABLE              cpu_to_be16(0x0017)
+#define IB_SMP_ATTR_VL_ARB_TABLE                cpu_to_be16(0x0018)
+#define IB_SMP_ATTR_LINEAR_FORWARD_TABLE        cpu_to_be16(0x0019)
+#define IB_SMP_ATTR_RANDOM_FORWARD_TABLE        cpu_to_be16(0x001A)
+#define IB_SMP_ATTR_MCAST_FORWARD_TABLE         cpu_to_be16(0x001B)
+#define IB_SMP_ATTR_SM_INFO                     cpu_to_be16(0x0020)
+#define IB_SMP_ATTR_VENDOR_DIAG                 cpu_to_be16(0x0030)
+#define IB_SMP_ATTR_LED_INFO                    cpu_to_be16(0x0031)
+#define IB_SMP_ATTR_VENDOR_MASK                 cpu_to_be16(0xFF00)
 
 struct ib_port_info {
         __be64 mkey;