I committed 3 changes that need to be pulled in from the trunk. 2703 ibat/resolve: retry ibat resolution 2702 libibverbs: release wvprovider reference from ibvwv_acquire_windata 2701 dapl: locking cleanup and fixes
The following older commits should also be pulled into the 2.2 release:
2689 libibverbs/device: destroy completion channel when closing device
2688 dapl: use private_data_len for mem copies
2687 dapl/cma: fix referencing freed address
2686 librdmacm: set private_data_len
2685 dapl: move close device after async thread is done using it
Additionally, the following 2 notable differences exist between the trunk and
2.2 release. (Diffs are included in the attached files.) Someone else would
need to comment on whether these are needed.
diff -up -r -X \mshefty\scm\gen1\trunk\docs\dontdiff.txt -I '\$Id'
c:\mshefty\scm\svn\gen1\branches\wof2-2\core\bus/kernel/bus_pnp.c
c:\mshefty\scm\svn\gen1\trunk\core\bus/kernel/bus_pnp.c
--- c:\mshefty\scm\svn\gen1\branches\wof2-2\core\bus/kernel/bus_pnp.c
2010-01-21 13:00:53.990000000 -0800
+++ c:\mshefty\scm\svn\gen1\trunk\core\bus/kernel/bus_pnp.c 2010-01-28
20:43:19.812500000 -0800
@@ -428,6 +428,10 @@ __register_ca(
{
BUS_TRACE_EXIT( BUS_DBG_ERROR, ("ib_register_ca returned %s.\n",
ib_get_err_str(ib_status)) );
+ p_ext->hca_ifc.InterfaceHeader.InterfaceDereference(
+ p_ext->hca_ifc.InterfaceHeader.Context);
+ p_ext->hca_ifc_taken = FALSE;
+
return STATUS_UNSUCCESSFUL;
}
BUS_TRACE_EXIT(BUS_DBG_PNP, ("%s bound to CA guid %I64x\n",
diff -up -r -X \mshefty\scm\gen1\trunk\docs\dontdiff.txt -I '\$Id'
c:\mshefty\scm\svn\gen1\branches\wof2-2\core\complib/kernel/cl_pnp_po.c
c:\mshefty\scm\svn\gen1\trunk\core\complib/kernel/cl_pnp_po.c
--- c:\mshefty\scm\svn\gen1\branches\wof2-2\core\complib/kernel/cl_pnp_po.c
2010-01-21 13:00:51.380625000 -0800
+++ c:\mshefty\scm\svn\gen1\trunk\core\complib/kernel/cl_pnp_po.c
2010-01-28 20:43:19.687500000 -0800
@@ -427,8 +427,15 @@ __start(
CL_ENTER( CL_DBG_PNP, p_ext->dbg_lvl );
status = p_ext->vfptr_pnp_po->pfn_start( p_dev_obj, p_irp, p_action );
- if( NT_SUCCESS( status ) )
+ if( NT_SUCCESS( status ) )
+ {
cl_set_pnp_state( p_ext, Started );
+ }
+ else
+ {
+ CL_TRACE( CL_DBG_ERROR, p_ext->dbg_lvl,
+ ("p_ext->vfptr_pnp_po->pfn_start returned %08x. \n",
status) );
+ }
CL_EXIT( CL_DBG_PNP, p_ext->dbg_lvl );
return status;
complib.diff
Description: Binary data
bus.diff
Description: Binary data
_______________________________________________ ofw mailing list [email protected] http://lists.openfabrics.org/cgi-bin/mailman/listinfo/ofw
