[rds-devel] [ofa-general] [PATCH] rds: fix compile breakage on ofed_2_6_27 tree

[Vladimir Sokolovsky]

Jon Mason wrote:
> RDS does not compile on 2.6.25 and 2.6.27 kernels due to a broken
> reference to a recently modified data struct.  The patch below modifies
> the reference to point to the new location.
> 
> Signed-Off-By: Jon Mason <jon at opengridcomputing.com>
> 
> diff --git a/net/rds/ib_recv.c b/net/rds/ib_recv.c
> index 6b3b476..9f72556 100644
> --- a/net/rds/ib_recv.c
> +++ b/net/rds/ib_recv.c
> @@ -796,7 +796,7 @@ void rds_ib_recv_cq_comp_handler(struct ib_cq *cq, void *context)
>  	while (ib_poll_cq(cq, 1, &wc) > 0) {
>  		rdsdebug("wc wr_id 0x%llx status %u byte_len %u imm_data %u\n",
>  			 (unsigned long long)wc.wr_id, wc.status, wc.byte_len,
> -			 be32_to_cpu(wc.imm_data));
> +			 be32_to_cpu(wc.ex.imm_data));
>  		rds_ib_stats_inc(s_ib_rx_cq_event);
>  
>  		recv = &ic->i_recvs[rds_ib_ring_oldest(&ic->i_recv_ring)];
> diff --git a/net/rds/ib_send.c b/net/rds/ib_send.c
> index 865301a..43d3faa 100644
> --- a/net/rds/ib_send.c
> +++ b/net/rds/ib_send.c
> @@ -195,7 +195,7 @@ void rds_ib_send_cq_comp_handler(struct ib_cq *cq, void *context)
>  	while (ib_poll_cq(cq, 1, &wc) > 0 ) {
>  		rdsdebug("wc wr_id 0x%llx status %u byte_len %u imm_data %u\n",
>  			 (unsigned long long)wc.wr_id, wc.status, wc.byte_len,
> -			 be32_to_cpu(wc.imm_data));
> +			 be32_to_cpu(wc.ex.imm_data));
>  		rds_ib_stats_inc(s_ib_tx_cq_event);
>  
>  		if (wc.wr_id == RDS_IB_ACK_WR_ID) {


Hi,
I applied this patch to git://git.openfabrics.org/ofed_1_4/linux-2.6.git ofed_2_6_27

Thanks,
Vladimir