[IPOIB_NDIS6_CM] simplify/clarify the IPOIB_INLINE_RECV conditionals by separating...

No Functionality changes!

git-svn-id: svn://openib.tc.cornell.edu/gen1@2870 ad392aa1-c5ef-ae45-8dd8-e69d62a5ef86

diff --git a/trunk/ulp/ipoib_NDIS6_CM/kernel/ipoib_port.cpp b/trunk/ulp/ipoib_NDIS6_CM/kernel/ipoib_port.cpp
index b2e4d3d36276d7782450ee263701e9c7585a568a..41fba4d83399bb7f395a163610c640dabe5a1d36 100644 (file)
--- a/trunk/ulp/ipoib_NDIS6_CM/kernel/ipoib_port.cpp
+++ b/trunk/ulp/ipoib_NDIS6_CM/kernel/ipoib_port.cpp
@@ -198,7 +198,7 @@ static void
 __recv_dtor(\r
        IN              const   cl_pool_item_t* const           p_pool_item,\r
        IN                              void                                            *context );\r
-#endif /* IPOIB_INLINE_RECV */\r
+#endif\r
 \r
 static inline ipoib_send_desc_t*\r
 __buf_mgr_get_send(\r
@@ -1410,11 +1410,17 @@ __buf_mgr_init(
        /* Allocate the receive descriptor pool */\r
        cl_status = cl_qpool_init( &p_port->buf_mgr.recv_pool,\r
                                                           p_params->rq_depth * p_params->recv_pool_ratio,\r
+                                                          0,\r
+                                                          0,\r
+                                                          sizeof(ipoib_recv_desc_t),\r
+                                                          __recv_ctor,\r
 #if IPOIB_INLINE_RECV\r
-               0, 0, sizeof(ipoib_recv_desc_t), __recv_ctor, NULL, p_port );\r
-#else  /* IPOIB_INLINE_RECV */\r
-               0, 0, sizeof(ipoib_recv_desc_t), __recv_ctor, __recv_dtor, p_port );\r
-#endif /* IPOIB_INLINE_RECV */\r
+                                                          NULL,\r
+#else\r
+                                                          __recv_dtor,\r
+#endif\r
+                                                          p_port );\r
+\r
        if( cl_status != CL_SUCCESS )\r
        {\r
                NdisWriteErrorLogEntry( p_port->p_adapter->h_adapter,\r
@@ -2214,12 +2220,14 @@ __recv_get_endpts(
        {\r
                /* Lookup the source endpoints based on GID. */\r
                cl_perf_start( GetEndptByGid );\r
-               *pp_src =\r
+               *pp_src = __endpt_mgr_get_by_gid( p_port,\r
 #if IPOIB_INLINE_RECV\r
-                       __endpt_mgr_get_by_gid( p_port, &p_desc->buf.ib.grh.src_gid );\r
-#else  /* IPOIB_INLINE_RECV */\r
-                       __endpt_mgr_get_by_gid( p_port, &p_desc->p_buf->ib.grh.src_gid );\r
-#endif /* IPOIB_INLINE_RECV */\r
+                                                                                 &p_desc->buf.ib.grh.src_gid\r
+#else\r
+                                                                                 &p_desc->p_buf->ib.grh.src_gid\r
+#endif\r
+                                                                                 );\r
+\r
                cl_perf_stop( &p_port->p_adapter->perf, GetEndptByGid );\r
 \r
                /*\r
@@ -2228,12 +2236,15 @@ __recv_get_endpts(
                 * whether to report this to NDIS.\r
                 */\r
                cl_perf_start( GetEndptByGid );\r
-               *pp_dst =\r
+\r
+               *pp_dst = __endpt_mgr_get_by_gid( p_port,\r
 #if IPOIB_INLINE_RECV\r
-                       __endpt_mgr_get_by_gid( p_port, &p_desc->buf.ib.grh.dest_gid );\r
-#else  /* IPOIB_INLINE_RECV */\r
-                       __endpt_mgr_get_by_gid( p_port, &p_desc->p_buf->ib.grh.dest_gid );\r
-#endif /* IPOIB_INLINE_RECV */\r
+                                                                                 &p_desc->buf.ib.grh.dest_gid\r
+#else\r
+                                                                                 &p_desc->p_buf->ib.grh.dest_gid\r
+#endif\r
+                                                                               );\r
+\r
                cl_perf_stop( &p_port->p_adapter->perf, GetEndptByGid );\r
 \r
                /*\r
@@ -2245,10 +2256,13 @@ __recv_get_endpts(
                {\r
                        status = ipoib_mac_from_guid(\r
 #if IPOIB_INLINE_RECV\r
-                               p_desc->buf.ib.grh.src_gid.unicast.interface_id, p_port->p_adapter->params.guid_mask, &mac );\r
-#else  /* IPOIB_INLINE_RECV */\r
-                               p_desc->p_buf->ib.grh.src_gid.unicast.interface_id, p_port->p_adapter->params.guid_mask, &mac );\r
-#endif /* IPOIB_INLINE_RECV */\r
+                                                               p_desc->buf.ib.grh.src_gid.unicast.interface_id,\r
+#else\r
+                                                               p_desc->p_buf->ib.grh.src_gid.unicast.interface_id,\r
+#endif\r
+                                                               p_port->p_adapter->params.guid_mask,\r
+                                                               &mac );\r
+                                                               \r
                        if( status != IB_SUCCESS )\r
                        {\r
                                IPOIB_PRINT_EXIT( TRACE_LEVEL_ERROR, IPOIB_DBG_ERROR,\r
@@ -2258,12 +2272,14 @@ __recv_get_endpts(
                        }\r
 \r
                        /* Create the endpoint. */\r
+                       *pp_src = ipoib_endpt_create( \r
 #if IPOIB_INLINE_RECV\r
-                       *pp_src = ipoib_endpt_create( &p_desc->buf.ib.grh.src_gid,\r
-#else  /* IPOIB_INLINE_RECV */\r
-                       *pp_src = ipoib_endpt_create( &p_desc->p_buf->ib.grh.src_gid,\r
-#endif /* IPOIB_INLINE_RECV */\r
-                               p_wc->recv.ud.remote_lid, p_wc->recv.ud.remote_qp );\r
+                                                                               &p_desc->buf.ib.grh.src_gid,\r
+#else\r
+                                                                               &p_desc->p_buf->ib.grh.src_gid,\r
+#endif\r
+                                                                               p_wc->recv.ud.remote_lid,\r
+                                                                               p_wc->recv.ud.remote_qp );\r
                        if( !*pp_src )\r
                        {\r
                                IPOIB_PRINT_EXIT( TRACE_LEVEL_ERROR, IPOIB_DBG_ERROR,\r
@@ -2416,10 +2432,10 @@ __recv_mgr_filter(
 #if IPOIB_INLINE_RECV\r
                p_ipoib = &p_desc->buf.ib.pkt;\r
                p_eth = &p_desc->buf.eth.pkt;\r
-#else  /* IPOIB_INLINE_RECV */\r
+#else\r
                p_ipoib = &p_desc->p_buf->ib.pkt;\r
                p_eth = &p_desc->p_buf->eth.pkt;\r
-#endif /*IPOIB_INLINE_RECV */\r
+#endif\r
 \r
                if( p_src )\r
                {\r