infiniband: remove __constant_{endian} uses
Subsystems (2)
PATCH 1/1 infiniband: remove __constant_{endian} uses
The base versions handle constant folding just fine, use them directly. The replacements are OK in the include/ files as they are not exported to userspace so we don't need the __ prefixed versions.
---
Roland, the necessary byteorder rework is now in -linus mainline and all arches have moved over, I'm starting to remove the uses of the __constant_* helpers now that they are equivalent.
If you'd like a more broken-up series, just ask.
drivers/infiniband/core/cm.c | 15 ++-- drivers/infiniband/core/cm_msgs.h | 22 +++--- drivers/infiniband/core/mad_rmpp.c | 2 +- drivers/infiniband/hw/cxgb3/iwch_qp.c | 4 +- drivers/infiniband/hw/ehca/ehca_sqp.c | 8 +- drivers/infiniband/hw/ipath/ipath_eeprom.c | 4 +- drivers/infiniband/hw/ipath/ipath_mad.c | 95 ++++++++++++------------- drivers/infiniband/hw/ipath/ipath_rc.c | 2 +- drivers/infiniband/hw/ipath/ipath_sdma.c | 4 +- drivers/infiniband/hw/ipath/ipath_uc.c | 2 +- drivers/infiniband/hw/ipath/ipath_ud.c | 4 +- drivers/infiniband/hw/ipath/ipath_user_sdma.c | 6 +- drivers/infiniband/hw/ipath/ipath_verbs.c | 2 +- drivers/infiniband/hw/ipath/ipath_verbs.h | 10 ++-- drivers/infiniband/hw/mlx4/qp.c | 22 +++--- include/rdma/ib_cm.h | 12 ++-- include/rdma/ib_mad.h | 2 +- include/rdma/ib_smi.h | 34 +++++----- 18 files changed, 124 insertions(+), 126 deletions(-)
drivers/infiniband/core/cm.c +7 -8
@@ -927,8 +927,7 @@ int ib_cm_listen(struct ib_cm_id *cm_id, __be64 service_id, __be64 service_mask,unsigned long flags;int ret =0 ; - service_mask = service_mask ? service_mask : -__constant_cpu_to_be64 (~0ULL ); + service_mask = service_mask ? service_mask : ~cpu_to_be64 (0 ); service_id &= service_mask;if ((service_id &IB_SERVICE_ID_AGN_MASK ) ==IB_CM_ASSIGN_SERVICE_ID && (service_id !=IB_CM_ASSIGN_SERVICE_ID ))
@@ -954,7 +953,7 @@ int ib_cm_listen(struct ib_cm_id *cm_id, __be64 service_id, __be64 service_mask,spin_lock_irqsave (&cm.lock, flags);if (service_id ==IB_CM_ASSIGN_SERVICE_ID ) { cm_id->service_id =cpu_to_be64 (cm.listen_service_id++); - cm_id->service_mask =__constant_cpu_to_be64 (~0ULL ); + cm_id->service_mask = ~cpu_to_be64 (0 ); }else { cm_id->service_id = service_id; cm_id->service_mask = service_mask;
@@ -1134,7 +1133,7 @@ int ib_send_cm_req(struct ib_cm_id *cm_id, goto error1; } cm_id->service_id = param->service_id; - cm_id->service_mask =__constant_cpu_to_be64 (~0ULL ); + cm_id->service_mask = ~cpu_to_be64 (0 ); cm_id_priv->timeout_ms =cm_convert_to_ms ( param->primary_path->packet_life_time) *2 + cm_convert_to_ms(
@@ -1545,7 +1544,7 @@ static int cm_req_handler(struct cm_work *work) cm_id_priv->id.cm_handler = listen_cm_id_priv->id.cm_handler; cm_id_priv->id.context = listen_cm_id_priv->id.context; cm_id_priv->id.service_id = req_msg->service_id; - cm_id_priv->id.service_mask =__constant_cpu_to_be64 (~0ULL ); + cm_id_priv->id.service_mask = ~cpu_to_be64 (0 );cm_process_routed_req (req_msg, work->mad_recv_wc->wc);cm_format_paths_from_req (req_msg, &work->path[0 ], &work->path[1 ]);
@@ -2898,7 +2897,7 @@ int ib_send_cm_sidr_req(struct ib_cm_id *cm_id, goto out; cm_id->service_id = param->service_id; - cm_id->service_mask =__constant_cpu_to_be64 (~0ULL ); + cm_id->service_mask = ~cpu_to_be64 (0 ); cm_id_priv->timeout_ms = param->timeout_ms; cm_id_priv->max_cm_retries = param->max_cm_retries; ret =cm_alloc_msg (cm_id_priv, &msg);
@@ -2992,7 +2991,7 @@ static int cm_sidr_req_handler(struct cm_work *work) cm_id_priv->id.cm_handler = cur_cm_id_priv->id.cm_handler; cm_id_priv->id.context = cur_cm_id_priv->id.context; cm_id_priv->id.service_id = sidr_req_msg->service_id; - cm_id_priv->id.service_mask =__constant_cpu_to_be64 (~0ULL ); + cm_id_priv->id.service_mask = ~cpu_to_be64 (0 );cm_format_sidr_req_event (work, &cur_cm_id_priv->id);cm_process_work (cm_id_priv, work);
@@ -3789,7 +3788,7 @@ static int __init ib_cm_init(void)rwlock_init (&cm.device_lock);spin_lock_init (&cm.lock); cm.listen_service_table =RB_ROOT ; - cm.listen_service_id =__constant_be64_to_cpu (IB_CM_ASSIGN_SERVICE_ID ); + cm.listen_service_id =be64_to_cpu (IB_CM_ASSIGN_SERVICE_ID ); cm.remote_id_table =RB_ROOT ; cm.remote_qp_table =RB_ROOT ; cm.remote_sidr_table =RB_ROOT ;
drivers/infiniband/core/cm_msgs.h +11 -11
@@ -44,17 +44,17 @@#define IB_CM_CLASS_VERSION 2/* IB specification 1.2 */ -#define CM_REQ_ATTR_ID __constant_htons(0x0010) -#define CM_MRA_ATTR_ID __constant_htons(0x0011) -#define CM_REJ_ATTR_ID __constant_htons(0x0012) -#define CM_REP_ATTR_ID __constant_htons(0x0013) -#define CM_RTU_ATTR_ID __constant_htons(0x0014) -#define CM_DREQ_ATTR_ID __constant_htons(0x0015) -#define CM_DREP_ATTR_ID __constant_htons(0x0016) -#define CM_SIDR_REQ_ATTR_ID __constant_htons(0x0017) -#define CM_SIDR_REP_ATTR_ID __constant_htons(0x0018) -#define CM_LAP_ATTR_ID __constant_htons(0x0019) -#define CM_APR_ATTR_ID __constant_htons(0x001A) +#define CM_REQ_ATTR_ID cpu_to_be16(0x0010) +#define CM_MRA_ATTR_ID cpu_to_be16(0x0011) +#define CM_REJ_ATTR_ID cpu_to_be16(0x0012) +#define CM_REP_ATTR_ID cpu_to_be16(0x0013) +#define CM_RTU_ATTR_ID cpu_to_be16(0x0014) +#define CM_DREQ_ATTR_ID cpu_to_be16(0x0015) +#define CM_DREP_ATTR_ID cpu_to_be16(0x0016) +#define CM_SIDR_REQ_ATTR_ID cpu_to_be16(0x0017) +#define CM_SIDR_REP_ATTR_ID cpu_to_be16(0x0018) +#define CM_LAP_ATTR_ID cpu_to_be16(0x0019) +#define CM_APR_ATTR_ID cpu_to_be16(0x001A)enum cm_msg_sequence {CM_MSG_SEQUENCE_REQ ,
drivers/infiniband/core/mad_rmpp.c +1 -1
@@ -735,7 +735,7 @@ process_rmpp_data(struct ib_mad_agent_private *agent, goto bad; } -if (rmpp_hdr->seg_num ==__constant_htonl (1 )) { +if (rmpp_hdr->seg_num ==cpu_to_be32 (1 )) {if (!(ib_get_rmpp_flags (rmpp_hdr) &IB_MGMT_RMPP_FLAG_FIRST )) { rmpp_status =IB_MGMT_RMPP_STATUS_BAD_SEG ; goto bad;
drivers/infiniband/hw/cxgb3/iwch_qp.c +2 -2
@@ -99,8 +99,8 @@ static int build_rdma_write(union t3_wr *wqe, struct ib_send_wr *wr,if (wr->opcode ==IB_WR_RDMA_WRITE_WITH_IMM ) { plen =4 ; wqe->write.sgl[0 ].stag = wr->ex.imm_data; - wqe->write.sgl[0 ].len =__constant_cpu_to_be32 (0 ); - wqe->write.num_sgle =__constant_cpu_to_be32 (0 ); + wqe->write.sgl[0 ].len =cpu_to_be32 (0 ); + wqe->write.num_sgle =cpu_to_be32 (0 ); *flit_cnt =6 ; }else { plen =0 ;
drivers/infiniband/hw/ehca/ehca_sqp.c +4 -4
@@ -46,11 +46,11 @@#include "ehca_iverbs.h" #include "hcp_if.h" -#define IB_MAD_STATUS_REDIRECT __constant_htons(0x0002) -#define IB_MAD_STATUS_UNSUP_VERSION __constant_htons(0x0004) -#define IB_MAD_STATUS_UNSUP_METHOD __constant_htons(0x0008) +#define IB_MAD_STATUS_REDIRECT cpu_to_be16(0x0002) +#define IB_MAD_STATUS_UNSUP_VERSION cpu_to_be16(0x0004) +#define IB_MAD_STATUS_UNSUP_METHOD cpu_to_be16(0x0008) -#define IB_PMA_CLASS_PORT_INFO __constant_htons(0x0001) +#define IB_PMA_CLASS_PORT_INFO cpu_to_be16(0x0001)/** * ehca_define_sqp - Defines special queue pair 1 (GSI QP). When special queue
drivers/infiniband/hw/ipath/ipath_eeprom.c +2 -2
@@ -772,8 +772,8 @@ void ipath_get_eeprom_info(struct ipath_devdata *dd) "0x%x, not 0x%x\n", csum, ifp->if_csum); goto done; } -if (*(__be64 *) ifp->if_guid ==0ULL || - *(__be64 *) ifp->if_guid ==__constant_cpu_to_be64 (-1LL )) { +if (*(__be64 *) ifp->if_guid ==cpu_to_be64 (0 ) || + *(__be64 *) ifp->if_guid == ~cpu_to_be64 (0 )) {ipath_dev_err (dd,"Invalid GUID %llx from flash; " "ignoring\n" , *(unsigned long long *) ifp->if_guid);
drivers/infiniband/hw/ipath/ipath_mad.c +47 -48
176 lines not on this page · raw message
drivers/infiniband/hw/ipath/ipath_rc.c +1 -1
@@ -1744,7 +1744,7 @@ void ipath_rc_rcv(struct ipath_ibdev *dev, struct ipath_ib_header *hdr,/* Signal completion event if the solicited bit is set. */ ipath_cq_enter (to_icq (qp->ibqp.recv_cq), &wc, (ohdr->bth[0 ] & -__constant_cpu_to_be32 (1 <<23 )) !=0 ); +cpu_to_be32 (1 <<23 )) !=0 );break ;case OP (RDMA_WRITE_FIRST ):
drivers/infiniband/hw/ipath/ipath_sdma.c +2 -2
@@ -781,10 +781,10 @@ retry: descqp = &dd->ipath_sdma_descq[dd->ipath_sdma_descq_cnt].qw[0 ]; descqp -=2 ;/* SDmaLastDesc */ - descqp[0 ] |=__constant_cpu_to_le64 (1ULL <<11 ); + descqp[0 ] |=cpu_to_le64 (1ULL <<11 );if (tx->txreq.flags &IPATH_SDMA_TXREQ_F_INTREQ ) {/* SDmaIntReq */ - descqp[0 ] |=__constant_cpu_to_le64 (1ULL <<15 ); + descqp[0 ] |=cpu_to_le64 (1ULL <<15 ); }/* Commit writes to memory and advance the tail on the chip */
drivers/infiniband/hw/ipath/ipath_uc.c +1 -1
@@ -419,7 +419,7 @@ void ipath_uc_rcv(struct ipath_ibdev *dev, struct ipath_ib_header *hdr,/* Signal completion event if the solicited bit is set. */ ipath_cq_enter (to_icq (qp->ibqp.recv_cq), &wc, (ohdr->bth[0 ] & -__constant_cpu_to_be32 (1 <<23 )) !=0 ); +cpu_to_be32 (1 <<23 )) !=0 );break ;case OP (RDMA_WRITE_FIRST ):
drivers/infiniband/hw/ipath/ipath_ud.c +2 -2
@@ -370,7 +370,7 @@ int ipath_make_ud_req(struct ipath_qp *qp)*/ ohdr->bth[1 ] = ah_attr->dlid >=IPATH_MULTICAST_LID_BASE && ah_attr->dlid !=IPATH_PERMISSIVE_LID ? -__constant_cpu_to_be32 (IPATH_MULTICAST_QPN ) : +cpu_to_be32 (IPATH_MULTICAST_QPN ) :cpu_to_be32 (wqe->wr.wr.ud.remote_qpn); ohdr->bth[2 ] =cpu_to_be32 (qp->s_next_psn++ &IPATH_PSN_MASK );/*
@@ -573,7 +573,7 @@ void ipath_ud_rcv(struct ipath_ibdev *dev, struct ipath_ib_header *hdr,/* Signal completion event if the solicited bit is set. */ ipath_cq_enter (to_icq (qp->ibqp.recv_cq), &wc, (ohdr->bth[0 ] & -__constant_cpu_to_be32 (1 <<23 )) !=0 ); +cpu_to_be32 (1 <<23 )) !=0 ); bail:; }
drivers/infiniband/hw/ipath/ipath_user_sdma.c +3 -3
@@ -667,13 +667,13 @@ static inline __le64 ipath_sdma_make_desc0(struct ipath_devdata *dd,static inline __le64 ipath_sdma_make_first_desc0 (__le64 descq) { -return descq |__constant_cpu_to_le64 (1ULL <<12 ); +return descq |cpu_to_le64 (1ULL <<12 ); }static inline __le64 ipath_sdma_make_last_desc0 (__le64 descq) {/* last */ /* dma head */ -return descq |__constant_cpu_to_le64 (1ULL <<11 |1ULL <<13 ); +return descq |cpu_to_le64 (1ULL <<11 |1ULL <<13 ); }static inline __le64 ipath_sdma_make_desc1 (u64 addr)
@@ -763,7 +763,7 @@ static int ipath_user_sdma_push_pkts(struct ipath_devdata *dd,if (ofs >=IPATH_SMALLBUF_DWORDS ) {for (i =0 ; i < pkt->naddr; i++) { dd->ipath_sdma_descq[dtail].qw[0 ] |= -__constant_cpu_to_le64 (1ULL <<14 ); +cpu_to_le64 (1ULL <<14 );if (++dtail == dd->ipath_sdma_descq_cnt) dtail =0 ; }
drivers/infiniband/hw/ipath/ipath_verbs.c +1 -1
@@ -1585,7 +1585,7 @@ static int ipath_query_port(struct ib_device *ibdev,u64 ibcstat;memset (props,0 ,sizeof (*props)); - props->lid = lid ? lid :__constant_be16_to_cpu (IB_LID_PERMISSIVE ); + props->lid = lid ? lid :be16_to_cpu (IB_LID_PERMISSIVE ); props->lmc = dd->ipath_lmc; props->sm_lid = dev->sm_lid; props->sm_sl = dev->sm_sl;
drivers/infiniband/hw/ipath/ipath_verbs.h +5 -5
@@ -86,11 +86,11 @@#define IB_PMA_SAMPLE_STATUS_RUNNING 0x02/* Mandatory IB performance counter select values. */ -#define IB_PMA_PORT_XMIT_DATA __constant_htons(0x0001) -#define IB_PMA_PORT_RCV_DATA __constant_htons(0x0002) -#define IB_PMA_PORT_XMIT_PKTS __constant_htons(0x0003) -#define IB_PMA_PORT_RCV_PKTS __constant_htons(0x0004) -#define IB_PMA_PORT_XMIT_WAIT __constant_htons(0x0005) +#define IB_PMA_PORT_XMIT_DATA cpu_to_be16(0x0001) +#define IB_PMA_PORT_RCV_DATA cpu_to_be16(0x0002) +#define IB_PMA_PORT_XMIT_PKTS cpu_to_be16(0x0003) +#define IB_PMA_PORT_RCV_PKTS cpu_to_be16(0x0004) +#define IB_PMA_PORT_XMIT_WAIT cpu_to_be16(0x0005)struct ib_reth {__be64 vaddr;
drivers/infiniband/hw/mlx4/qp.c +11 -11
@@ -71,17 +71,17 @@ enum { };static const __be32 mlx4_ib_opcode[] = { - [IB_WR_SEND ] =__constant_cpu_to_be32 (MLX4_OPCODE_SEND ), - [IB_WR_LSO ] =__constant_cpu_to_be32 (MLX4_OPCODE_LSO ), - [IB_WR_SEND_WITH_IMM ] =__constant_cpu_to_be32 (MLX4_OPCODE_SEND_IMM ), - [IB_WR_RDMA_WRITE ] =__constant_cpu_to_be32 (MLX4_OPCODE_RDMA_WRITE ), - [IB_WR_RDMA_WRITE_WITH_IMM ] =__constant_cpu_to_be32 (MLX4_OPCODE_RDMA_WRITE_IMM ), - [IB_WR_RDMA_READ ] =__constant_cpu_to_be32 (MLX4_OPCODE_RDMA_READ ), - [IB_WR_ATOMIC_CMP_AND_SWP ] =__constant_cpu_to_be32 (MLX4_OPCODE_ATOMIC_CS ), - [IB_WR_ATOMIC_FETCH_AND_ADD ] =__constant_cpu_to_be32 (MLX4_OPCODE_ATOMIC_FA ), - [IB_WR_SEND_WITH_INV ] =__constant_cpu_to_be32 (MLX4_OPCODE_SEND_INVAL ), - [IB_WR_LOCAL_INV ] =__constant_cpu_to_be32 (MLX4_OPCODE_LOCAL_INVAL ), - [IB_WR_FAST_REG_MR ] =__constant_cpu_to_be32 (MLX4_OPCODE_FMR ), + [IB_WR_SEND ] =cpu_to_be32 (MLX4_OPCODE_SEND ), + [IB_WR_LSO ] =cpu_to_be32 (MLX4_OPCODE_LSO ), + [IB_WR_SEND_WITH_IMM ] =cpu_to_be32 (MLX4_OPCODE_SEND_IMM ), + [IB_WR_RDMA_WRITE ] =cpu_to_be32 (MLX4_OPCODE_RDMA_WRITE ), + [IB_WR_RDMA_WRITE_WITH_IMM ] =cpu_to_be32 (MLX4_OPCODE_RDMA_WRITE_IMM ), + [IB_WR_RDMA_READ ] =cpu_to_be32 (MLX4_OPCODE_RDMA_READ ), + [IB_WR_ATOMIC_CMP_AND_SWP ] =cpu_to_be32 (MLX4_OPCODE_ATOMIC_CS ), + [IB_WR_ATOMIC_FETCH_AND_ADD ] =cpu_to_be32 (MLX4_OPCODE_ATOMIC_FA ), + [IB_WR_SEND_WITH_INV ] =cpu_to_be32 (MLX4_OPCODE_SEND_INVAL ), + [IB_WR_LOCAL_INV ] =cpu_to_be32 (MLX4_OPCODE_LOCAL_INVAL ), + [IB_WR_FAST_REG_MR ] =cpu_to_be32 (MLX4_OPCODE_FMR ), };static struct mlx4_ib_sqp *to_msqp (struct mlx4_ib_qp *mqp)
include/rdma/ib_cm.h +6 -6
@@ -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 ];
include/rdma/ib_mad.h +1 -1
@@ -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
include/rdma/ib_smi.h +17 -17
@@ -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;
Signature · 1 line
1.6.1.249.g455e5
Quoted 3 lines
Roland, the necessary byteorder rework is now in -linus mainline and all arches have moved over, I'm starting to remove the uses of the __constant_* helpers now that they are equivalent.
This looks good, thanks. I assume the expectation is that this should be queued for the next merge window?
Code generation should be unaffected, right?
- R.
Quoted 9 lines · Roland Dreier
Quoted 3 lines
Roland, the necessary byteorder rework is now in -linus mainline and all arches have moved over, I'm starting to remove the uses of the __constant_* helpers now that they are equivalent.
This looks good, thanks. I assume the expectation is that this should be queued for the next merge window?
Code generation should be unaffected, right?
Your call, it's only a name change, the implementation on the back end is now the same for both, so I expect the generated code to be identical.
But it is obviously not urgent, so holding for 2.6.30 is just fine.
Harvey