Signed-off by [email protected]

See included .patch file if mailer clobbers whitespace alignment.

I will svn commit on your approval.

Thanks,

Stan.

diff U3 Z:/Documents and Settings/scsmith/My 
Documents/openIB-windows/SVN/gen1/trunk/core/bus/kernel/bus_driver.c 
F:/openIB-windows-svn/latest/gen1/trunk/core/bus/kernel/bus_driver.c
--- Z:/Documents and Settings/scsmith/My 
Documents/openIB-windows/SVN/gen1/trunk/core/bus/kernel/bus_driver.c   Mon May 
11 11:00:02 2009
+++ F:/openIB-windows-svn/latest/gen1/trunk/core/bus/kernel/bus_driver.c        
Mon May 11 17:19:32 2009
@@ -1078,14 +1078,14 @@
                        /* failure is OK - retry in bus_add_device() */
                }
                else {
-                               p_ext = g_ControlDeviceObject->DeviceExtension;
-                               RtlZeroMemory(p_ext, sizeof *p_ext);
-                               cl_init_pnp_po_ext( g_ControlDeviceObject, NULL,
-                                       NULL, bus_globals.dbg_lvl, NULL, NULL );
-                               IoInitializeRemoveLock( 
&p_ext->cl_ext.stop_lock, 'dtci', 0, 1000 );
-                       }
+                       p_ext = g_ControlDeviceObject->DeviceExtension;
+                       RtlZeroMemory(p_ext, sizeof *p_ext);
+                       cl_init_pnp_po_ext( g_ControlDeviceObject, NULL,
+                                                               NULL, 
bus_globals.dbg_lvl, NULL, NULL );
+                       IoInitializeRemoveLock( &p_ext->cl_ext.stop_lock, 
'dtci', 0, 1000 );
                }
-
+       }
+
        BUS_EXIT( BUS_DBG_DRV );
        return STATUS_SUCCESS;
 }

diff U3 Z:/Documents and Settings/scsmith/My 
Documents/openIB-windows/SVN/gen1/trunk/core/bus/kernel/bus_port_mgr.c 
F:/openIB-windows-svn/latest/gen1/trunk/core/bus/kernel/bus_port_mgr.c
--- Z:/Documents and Settings/scsmith/My 
Documents/openIB-windows/SVN/gen1/trunk/core/bus/kernel/bus_port_mgr.c Mon May 
11 11:00:02 2009
+++ F:/openIB-windows-svn/latest/gen1/trunk/core/bus/kernel/bus_port_mgr.c      
Mon May 11 15:35:35 2009
@@ -421,12 +421,12 @@
                        deref_al_obj( &p_ext->h_ca->obj );
                }

-                       BUS_TRACE( BUS_DBG_PNP, ("%s Deleted device %s: PDO %p, 
ext %p\n",
+               BUS_TRACE( BUS_DBG_PNP, ("%s Deleted device %s: PDO %p, ext 
%p\n",
                                                p_bfi->whoami, 
p_ext->cl_ext.vfptr_pnp_po->identity,
                                                p_ext->cl_ext.p_self_do, p_ext 
) );

-                       IoDeleteDevice( p_ext->cl_ext.p_self_do );
-               }
+               IoDeleteDevice( p_ext->cl_ext.p_self_do );
+       }

        cl_mutex_destroy( &p_port_mgr->pdo_mutex );
        cl_obj_deinit( p_obj );
@@ -1275,9 +1275,11 @@

        deref_al_obj( &p_ext->h_ca->obj );

-       //      Setting h_ca to be NULL forces IPoIB to start only after 
re-acquiring new CA object
-       // The latter happens in __port_was_hibernated or port_mgr_port_add 
functions
-       // after arriving IB_PNP_PORT_ADD event from IBAL
+       /* Setting h_ca to be NULL forces IPoIB to start only after re-acquiring
+        * new CA object. The latter happens in __port_was_hibernated or
+        * port_mgr_port_add functions  after arriving IB_PNP_PORT_ADD event
+        * from IBAL.
+        */
        p_ext->h_ca = NULL;

        p_pdo_list = &p_port_mgr->port_list;

Attachment: bus_driver.c.patch
Description: bus_driver.c.patch

Attachment: bus_port_mgr.c.patch
Description: bus_port_mgr.c.patch

_______________________________________________
ofw mailing list
[email protected]
http://lists.openfabrics.org/cgi-bin/mailman/listinfo/ofw

Reply via email to