From 9670c2837cdfc5d07122265677101b8303b95377 Mon Sep 17 00:00:00 2001 From: Ramachandra K Date: Fri, 27 Feb 2009 10:33:12 -0800 Subject: [PATCH] --- yaml --- r: 133629 b: refs/heads/master c: 7020cb0fe216fdcec246cdc2412614a3190fbb2f h: refs/heads/master i: 133627: dbdb306cf9ef5e50203911bc2923ce8eb01ab94e v: v3 --- [refs] | 2 +- trunk/drivers/infiniband/ulp/iser/iser_verbs.c | 7 +++++++ trunk/include/rdma/ib_mad.h | 2 +- 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index e08937fed219..3bab4f1ec980 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 1aedb7721f05461f777fdee25b50d8a168c425ed +refs/heads/master: 7020cb0fe216fdcec246cdc2412614a3190fbb2f diff --git a/trunk/drivers/infiniband/ulp/iser/iser_verbs.c b/trunk/drivers/infiniband/ulp/iser/iser_verbs.c index ea9e1556e0d6..319b188145be 100644 --- a/trunk/drivers/infiniband/ulp/iser/iser_verbs.c +++ b/trunk/drivers/infiniband/ulp/iser/iser_verbs.c @@ -401,6 +401,13 @@ static void iser_route_handler(struct rdma_cm_id *cma_id) if (ret) goto failure; + iser_dbg("path.mtu is %d setting it to %d\n", + cma_id->route.path_rec->mtu, IB_MTU_1024); + + /* we must set the MTU to 1024 as this is what the target is assuming */ + if (cma_id->route.path_rec->mtu > IB_MTU_1024) + cma_id->route.path_rec->mtu = IB_MTU_1024; + memset(&conn_param, 0, sizeof conn_param); conn_param.responder_resources = 4; conn_param.initiator_depth = 1; diff --git a/trunk/include/rdma/ib_mad.h b/trunk/include/rdma/ib_mad.h index 5f6c40fffcf4..1a0f409f1700 100644 --- a/trunk/include/rdma/ib_mad.h +++ b/trunk/include/rdma/ib_mad.h @@ -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); }