]> git.openfabrics.org - ~shefty/rdma-win.git/commitdiff
projects / ~shefty / rdma-win.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 423947f)
[IPoIB_NDIS6_CM] oops - checked in the wrong set of files for EndPoint initialization...
authorStan Smith <stan.smith@intel.com>
Fri, 1 Oct 2010 16:56:14 +0000 (16:56 +0000)
committerStan Smith <stan.smith@intel.com>
Fri, 1 Oct 2010 16:56:14 +0000 (16:56 +0000)
git-svn-id: svn://openib.tc.cornell.edu/gen1@2952 ad392aa1-c5ef-ae45-8dd8-e69d62a5ef86

branches/WOF2-3/ulp/ipoib_NDIS6_CM/kernel/ipoib_endpoint.cpp patch | blob | history
branches/WOF2-3/ulp/ipoib_NDIS6_CM/kernel/ipoib_endpoint.h patch | blob | history
branches/WOF2-3/ulp/ipoib_NDIS6_CM/kernel/ipoib_port.cpp patch | blob | history
trunk/ulp/ipoib_NDIS6_CM/kernel/ipoib_endpoint.cpp patch | blob | history
trunk/ulp/ipoib_NDIS6_CM/kernel/ipoib_endpoint.h patch | blob | history
trunk/ulp/ipoib_NDIS6_CM/kernel/ipoib_port.cpp patch | blob | history

diff --git a/branches/WOF2-3/ulp/ipoib_NDIS6_CM/kernel/ipoib_endpoint.cpp b/branches/WOF2-3/ulp/ipoib_NDIS6_CM/kernel/ipoib_endpoint.cpp
index 7a8830a3892048f40cfe138fc14f751cd8fa93b0..c3c0237c9eb1de01d4c43b234881699bcbc56f87 100644 (file)
--- a/branches/WOF2-3/ulp/ipoib_NDIS6_CM/kernel/ipoib_endpoint.cpp
+++ b/branches/WOF2-3/ulp/ipoib_NDIS6_CM/kernel/ipoib_endpoint.cpp
@@ -146,6 +146,7 @@ __endpt_cm_recv_udp(
 \r
 ipoib_endpt_t*\r
 ipoib_endpt_create(\r
+       IN              const   ipoib_port_t* const                     p_port,\r
        IN              const   ib_gid_t* const                         p_dgid,\r
        IN              const   net16_t                                         dlid,\r
        IN              const   net32_t                                         qpn )\r
diff --git a/branches/WOF2-3/ulp/ipoib_NDIS6_CM/kernel/ipoib_endpoint.h b/branches/WOF2-3/ulp/ipoib_NDIS6_CM/kernel/ipoib_endpoint.h
index 6f027a00332b389ab5dfb1c697f1042dea667ba6..1e3f7ff4a35dd242084e9f699da5e56a6da0747f 100644 (file)
--- a/branches/WOF2-3/ulp/ipoib_NDIS6_CM/kernel/ipoib_endpoint.h
+++ b/branches/WOF2-3/ulp/ipoib_NDIS6_CM/kernel/ipoib_endpoint.h
@@ -175,6 +175,7 @@ typedef struct _ipoib_endpt
 \r
 ipoib_endpt_t*\r
 ipoib_endpt_create(\r
+       IN              const   ipoib_port_t* const                     p_port,\r
        IN              const   ib_gid_t* const                         p_dgid,\r
        IN              const   net16_t                                         dlid,\r
        IN              const   net32_t                                         qpn );\r
diff --git a/branches/WOF2-3/ulp/ipoib_NDIS6_CM/kernel/ipoib_port.cpp b/branches/WOF2-3/ulp/ipoib_NDIS6_CM/kernel/ipoib_port.cpp
index a19b06af38a1bcca31cb452c70c857487f51fa26..d7b452e83ef13d8be8cd40cba92614cec367083b 100644 (file)
--- a/branches/WOF2-3/ulp/ipoib_NDIS6_CM/kernel/ipoib_port.cpp
+++ b/branches/WOF2-3/ulp/ipoib_NDIS6_CM/kernel/ipoib_port.cpp
@@ -2325,6 +2325,7 @@ __recv_get_endpts(
 \r
                        /* Create the endpoint. */\r
                        *pp_src = ipoib_endpt_create( \r
+                                                                               p_port,\r
 #if IPOIB_INLINE_RECV\r
                                                                                &p_desc->buf.ib.grh.src_gid,\r
 #else\r
@@ -2968,7 +2969,8 @@ __recv_arp(
                /*\r
                 * Create the endpoint.\r
                 */\r
-               *pp_src = ipoib_endpt_create( &p_ib_arp->src_hw.gid,\r
+               *pp_src = ipoib_endpt_create( p_port,\r
+                                                                         &p_ib_arp->src_hw.gid,\r
                                                                          p_wc->recv.ud.remote_lid,                                                                                                                        ipoib_addr_get_qpn( &p_ib_arp->src_hw ) );\r
 \r
                if( !*pp_src )\r
@@ -6797,7 +6799,8 @@ __endpt_mgr_add_bcast(
        p_port->ib_mgr.bcast_rec = *p_mcast_rec->p_member_rec;\r
 \r
        /* Allocate the broadcast endpoint. */\r
-       p_endpt = ipoib_endpt_create( &p_mcast_rec->p_member_rec->mgid,\r
+       p_endpt = ipoib_endpt_create( p_port,\r
+                                                                 &p_mcast_rec->p_member_rec->mgid,\r
                                                                  0,\r
                                                                  CL_HTON32(0x00FFFFFF) );\r
        if( !p_endpt )\r
@@ -7055,7 +7058,7 @@ __endpt_mgr_add_local(
        IPOIB_ENTER( IPOIB_DBG_INIT );\r
 \r
        ib_gid_set_default( &gid, p_port->p_adapter->guids.port_guid.guid );\r
-       p_endpt = ipoib_endpt_create( &gid, p_port_info->base_lid, p_port->ib_mgr.qpn );\r
+       p_endpt = ipoib_endpt_create( p_port, &gid, p_port_info->base_lid, p_port->ib_mgr.qpn );\r
        if( !p_endpt )\r
        {\r
                p_port->p_adapter->hung = TRUE;\r
@@ -7832,7 +7835,8 @@ ipoib_port_join_mcast(
         * mcast callback is invoked, it would not find the corresponding endpoint\r
         * and would be undone.\r
         */\r
-       p_endpt = ipoib_endpt_create( &mcast_req.member_rec.mgid,\r
+       p_endpt = ipoib_endpt_create( p_port,\r
+                                                                 &mcast_req.member_rec.mgid,\r
                                                                  0,\r
                                                                  CL_HTON32(0x00FFFFFF) );\r
        if( !p_endpt )\r
diff --git a/trunk/ulp/ipoib_NDIS6_CM/kernel/ipoib_endpoint.cpp b/trunk/ulp/ipoib_NDIS6_CM/kernel/ipoib_endpoint.cpp
index 7a8830a3892048f40cfe138fc14f751cd8fa93b0..c3c0237c9eb1de01d4c43b234881699bcbc56f87 100644 (file)
--- a/trunk/ulp/ipoib_NDIS6_CM/kernel/ipoib_endpoint.cpp
+++ b/trunk/ulp/ipoib_NDIS6_CM/kernel/ipoib_endpoint.cpp
@@ -146,6 +146,7 @@ __endpt_cm_recv_udp(
 \r
 ipoib_endpt_t*\r
 ipoib_endpt_create(\r
+       IN              const   ipoib_port_t* const                     p_port,\r
        IN              const   ib_gid_t* const                         p_dgid,\r
        IN              const   net16_t                                         dlid,\r
        IN              const   net32_t                                         qpn )\r
diff --git a/trunk/ulp/ipoib_NDIS6_CM/kernel/ipoib_endpoint.h b/trunk/ulp/ipoib_NDIS6_CM/kernel/ipoib_endpoint.h
index 6f027a00332b389ab5dfb1c697f1042dea667ba6..1e3f7ff4a35dd242084e9f699da5e56a6da0747f 100644 (file)
--- a/trunk/ulp/ipoib_NDIS6_CM/kernel/ipoib_endpoint.h
+++ b/trunk/ulp/ipoib_NDIS6_CM/kernel/ipoib_endpoint.h
@@ -175,6 +175,7 @@ typedef struct _ipoib_endpt
 \r
 ipoib_endpt_t*\r
 ipoib_endpt_create(\r
+       IN              const   ipoib_port_t* const                     p_port,\r
        IN              const   ib_gid_t* const                         p_dgid,\r
        IN              const   net16_t                                         dlid,\r
        IN              const   net32_t                                         qpn );\r
diff --git a/trunk/ulp/ipoib_NDIS6_CM/kernel/ipoib_port.cpp b/trunk/ulp/ipoib_NDIS6_CM/kernel/ipoib_port.cpp
index a19b06af38a1bcca31cb452c70c857487f51fa26..d7b452e83ef13d8be8cd40cba92614cec367083b 100644 (file)
--- a/trunk/ulp/ipoib_NDIS6_CM/kernel/ipoib_port.cpp
+++ b/trunk/ulp/ipoib_NDIS6_CM/kernel/ipoib_port.cpp
@@ -2325,6 +2325,7 @@ __recv_get_endpts(
 \r
                        /* Create the endpoint. */\r
                        *pp_src = ipoib_endpt_create( \r
+                                                                               p_port,\r
 #if IPOIB_INLINE_RECV\r
                                                                                &p_desc->buf.ib.grh.src_gid,\r
 #else\r
@@ -2968,7 +2969,8 @@ __recv_arp(
                /*\r
                 * Create the endpoint.\r
                 */\r
-               *pp_src = ipoib_endpt_create( &p_ib_arp->src_hw.gid,\r
+               *pp_src = ipoib_endpt_create( p_port,\r
+                                                                         &p_ib_arp->src_hw.gid,\r
                                                                          p_wc->recv.ud.remote_lid,                                                                                                                        ipoib_addr_get_qpn( &p_ib_arp->src_hw ) );\r
 \r
                if( !*pp_src )\r
@@ -6797,7 +6799,8 @@ __endpt_mgr_add_bcast(
        p_port->ib_mgr.bcast_rec = *p_mcast_rec->p_member_rec;\r
 \r
        /* Allocate the broadcast endpoint. */\r
-       p_endpt = ipoib_endpt_create( &p_mcast_rec->p_member_rec->mgid,\r
+       p_endpt = ipoib_endpt_create( p_port,\r
+                                                                 &p_mcast_rec->p_member_rec->mgid,\r
                                                                  0,\r
                                                                  CL_HTON32(0x00FFFFFF) );\r
        if( !p_endpt )\r
@@ -7055,7 +7058,7 @@ __endpt_mgr_add_local(
        IPOIB_ENTER( IPOIB_DBG_INIT );\r
 \r
        ib_gid_set_default( &gid, p_port->p_adapter->guids.port_guid.guid );\r
-       p_endpt = ipoib_endpt_create( &gid, p_port_info->base_lid, p_port->ib_mgr.qpn );\r
+       p_endpt = ipoib_endpt_create( p_port, &gid, p_port_info->base_lid, p_port->ib_mgr.qpn );\r
        if( !p_endpt )\r
        {\r
                p_port->p_adapter->hung = TRUE;\r
@@ -7832,7 +7835,8 @@ ipoib_port_join_mcast(
         * mcast callback is invoked, it would not find the corresponding endpoint\r
         * and would be undone.\r
         */\r
-       p_endpt = ipoib_endpt_create( &mcast_req.member_rec.mgid,\r
+       p_endpt = ipoib_endpt_create( p_port,\r
+                                                                 &mcast_req.member_rec.mgid,\r
                                                                  0,\r
                                                                  CL_HTON32(0x00FFFFFF) );\r
        if( !p_endpt )\r
Clone of Windows SVN development tree