[ofa-general] [PATCH 2.6.21] iw_cxgb3 - Add set_tcb_rpl_handler.

[ofa-general] [PATCH 2.6.21] iw_cxgb3 - Add set_tcb_rpl_handler.

[Steve Wise]

Hey Roland,

This patch is needed for iw_cxgb3 to handle a change in the cxgb3 driver
posted by Divy that Jeff recently applied.  If the cxgb3 change is
destined for 2.6.21, then this change to iw_cxgb3 also needs to go in
(otherwise we get an error log entry for every rdma connection).  

It was an oversight that this patch didn't really get included in Divy's
series since the two go together.

See http://marc.info/?l=linux-netdev&m=117617444422260&w=2


Thanks,

Steve.


---


Add set_tcb_rpl_handler.

The Ethernet Driver no longer handles SET_TCB replies.

Signed-off-by: Steve Wise <swise@opengridcomputing.com>
---

 drivers/infiniband/hw/cxgb3/iwch_cm.c |   12 ++++++++++++
 1 files changed, 12 insertions(+), 0 deletions(-)

diff --git a/drivers/infiniband/hw/cxgb3/iwch_cm.c b/drivers/infiniband/hw/cxgb3/iwch_cm.c
index d0ed1d3..2d2de9b 100644
--- a/drivers/infiniband/hw/cxgb3/iwch_cm.c
+++ b/drivers/infiniband/hw/cxgb3/iwch_cm.c
@@ -2026,6 +2026,17 @@ static int sched(struct t3cdev *tdev, st
 	return 0;
 }
 
+static int set_tcb_rpl(struct t3cdev *tdev, struct sk_buff *skb, void *ctx)
+{
+	struct cpl_set_tcb_rpl *rpl = cplhdr(skb);
+
+	if (rpl->status != CPL_ERR_NONE) {
+		printk(KERN_ERR MOD "Unexpected SET_TCB_RPL status %u "
+		       "for tid %u\n", rpl->status, GET_TID(rpl));
+	}
+	return CPL_RET_BUF_DONE;
+}
+
 int __init iwch_cm_init(void)
 {
 	skb_queue_head_init(&rxq);
@@ -2053,6 +2064,7 @@ int __init iwch_cm_init(void)
 	t3c_handlers[CPL_ABORT_REQ_RSS] = sched;
 	t3c_handlers[CPL_RDMA_TERMINATE] = sched;
 	t3c_handlers[CPL_RDMA_EC_STATUS] = sched;
+	t3c_handlers[CPL_SET_TCB_RPL] = set_tcb_rpl;
 
 	/*
 	 * These are the real handlers that are called from a

[ofa-general] Re: [PATCH 2.6.21] iw_cxgb3 - Add set_tcb_rpl_handler.

[Divy Le Ray]

Steve Wise wrote:
> Hey Roland,
>
> This patch is needed for iw_cxgb3 to handle a change in the cxgb3 driver
> posted by Divy that Jeff recently applied.  If the cxgb3 change is
> destined for 2.6.21, then this change to iw_cxgb3 also needs to go in
> (otherwise we get an error log entry for every rdma connection).  
>
> It was an oversight that this patch didn't really get included in Divy's
> series since the two go together.
>
> See http://marc.info/?l=linux-netdev&m=117617444422260&w=2
>
>
> Thanks,
>
> Steve.
>
>
> ---
>
>
> Add set_tcb_rpl_handler.
>
> The Ethernet Driver no longer handles SET_TCB replies.
>
> Signed-off-by: Steve Wise <swise@opengridcomputing.com>
>   
Acked-by: Divy Le Ray <divy@chelsio.com>

[ofa-general] Re: [PATCH 2.6.21] iw_cxgb3 - Add set_tcb_rpl_handler.

[Roland Dreier]

So is the cxgb3 net driver change in question already in Linus's tree?
What is the exact patch that this change goes with?

Re: [PATCH 2.6.21] iw_cxgb3 - Add set_tcb_rpl_handler.

[Steve Wise]

On Thu, 2007-04-12 at 08:23 -0700, Roland Dreier wrote:
> So is the cxgb3 net driver change in question already in Linus's tree?
> What is the exact patch that this change goes with?

The patch is the 3rd of 3:

http://marc.info/?l=linux-kernel&m=117617444622279&w=2


Jeff applied it into his upstream tree here:

http://marc.info/?l=linux-netdev&m=117630664627997&w=2

[ofa-general] Re: [PATCH 2.6.21] iw_cxgb3 - Add set_tcb_rpl_handler.

[Roland Dreier]

 > The patch is the 3rd of 3:
 > 
 > http://marc.info/?l=linux-kernel&m=117617444622279&w=2
 > 
 > Jeff applied it into his upstream tree here:
 > 
 > http://marc.info/?l=linux-netdev&m=117630664627997&w=2

OK, so it's not in Linus's tree yet.  Jeff, how do you want to handle
this?  (That last patch breaks drivers/infiniband/hw/cxgb3, and Steve
posted a fix to handle it)

The cleanest thing would be for you to roll up Steve's fix into the
patch you merged, so that Linus's tree is never in the state where it
has half the change merged.  But I don't know if that fits your
workflow.

Thanks...

Re: [ofa-general] Re: [PATCH 2.6.21] iw_cxgb3 - Add set_tcb_rpl_handler.

[Roland Dreier]

Never mind, I see that "cxgb3 - missing CPL hanler and register
setting." has appeared in Linus's tree.  Steve, I'll ask Linus to pull
this fix today.  Jeff, never mind my question since it's too late now.

 - R.