From 5baf65a8504da4449cff4e7b40565abeebca4858 Mon Sep 17 00:00:00 2001 From: Stan Smith Date: Fri, 1 Oct 2010 16:56:14 +0000 Subject: [PATCH] [IPoIB_NDIS6_CM] oops - checked in the wrong set of files for EndPoint initialization; this commits fixes commit 2951 (ipoib_endpt_create() needs p_port passed in). git-svn-id: svn://openib.tc.cornell.edu/gen1@2952 ad392aa1-c5ef-ae45-8dd8-e69d62a5ef86 --- .../ulp/ipoib_NDIS6_CM/kernel/ipoib_endpoint.cpp | 1 + .../ulp/ipoib_NDIS6_CM/kernel/ipoib_endpoint.h | 1 + .../WOF2-3/ulp/ipoib_NDIS6_CM/kernel/ipoib_port.cpp | 12 ++++++++---- trunk/ulp/ipoib_NDIS6_CM/kernel/ipoib_endpoint.cpp | 1 + trunk/ulp/ipoib_NDIS6_CM/kernel/ipoib_endpoint.h | 1 + trunk/ulp/ipoib_NDIS6_CM/kernel/ipoib_port.cpp | 12 ++++++++---- 6 files changed, 20 insertions(+), 8 deletions(-) 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 7a8830a3..c3c0237c 100644 --- 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( ipoib_endpt_t* ipoib_endpt_create( + IN const ipoib_port_t* const p_port, IN const ib_gid_t* const p_dgid, IN const net16_t dlid, IN const net32_t qpn ) 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 6f027a00..1e3f7ff4 100644 --- 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 ipoib_endpt_t* ipoib_endpt_create( + IN const ipoib_port_t* const p_port, IN const ib_gid_t* const p_dgid, IN const net16_t dlid, IN const net32_t qpn ); 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 a19b06af..d7b452e8 100644 --- 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( /* Create the endpoint. */ *pp_src = ipoib_endpt_create( + p_port, #if IPOIB_INLINE_RECV &p_desc->buf.ib.grh.src_gid, #else @@ -2968,7 +2969,8 @@ __recv_arp( /* * Create the endpoint. */ - *pp_src = ipoib_endpt_create( &p_ib_arp->src_hw.gid, + *pp_src = ipoib_endpt_create( p_port, + &p_ib_arp->src_hw.gid, p_wc->recv.ud.remote_lid, ipoib_addr_get_qpn( &p_ib_arp->src_hw ) ); if( !*pp_src ) @@ -6797,7 +6799,8 @@ __endpt_mgr_add_bcast( p_port->ib_mgr.bcast_rec = *p_mcast_rec->p_member_rec; /* Allocate the broadcast endpoint. */ - p_endpt = ipoib_endpt_create( &p_mcast_rec->p_member_rec->mgid, + p_endpt = ipoib_endpt_create( p_port, + &p_mcast_rec->p_member_rec->mgid, 0, CL_HTON32(0x00FFFFFF) ); if( !p_endpt ) @@ -7055,7 +7058,7 @@ __endpt_mgr_add_local( IPOIB_ENTER( IPOIB_DBG_INIT ); ib_gid_set_default( &gid, p_port->p_adapter->guids.port_guid.guid ); - p_endpt = ipoib_endpt_create( &gid, p_port_info->base_lid, p_port->ib_mgr.qpn ); + p_endpt = ipoib_endpt_create( p_port, &gid, p_port_info->base_lid, p_port->ib_mgr.qpn ); if( !p_endpt ) { p_port->p_adapter->hung = TRUE; @@ -7832,7 +7835,8 @@ ipoib_port_join_mcast( * mcast callback is invoked, it would not find the corresponding endpoint * and would be undone. */ - p_endpt = ipoib_endpt_create( &mcast_req.member_rec.mgid, + p_endpt = ipoib_endpt_create( p_port, + &mcast_req.member_rec.mgid, 0, CL_HTON32(0x00FFFFFF) ); if( !p_endpt ) diff --git a/trunk/ulp/ipoib_NDIS6_CM/kernel/ipoib_endpoint.cpp b/trunk/ulp/ipoib_NDIS6_CM/kernel/ipoib_endpoint.cpp index 7a8830a3..c3c0237c 100644 --- 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( ipoib_endpt_t* ipoib_endpt_create( + IN const ipoib_port_t* const p_port, IN const ib_gid_t* const p_dgid, IN const net16_t dlid, IN const net32_t qpn ) diff --git a/trunk/ulp/ipoib_NDIS6_CM/kernel/ipoib_endpoint.h b/trunk/ulp/ipoib_NDIS6_CM/kernel/ipoib_endpoint.h index 6f027a00..1e3f7ff4 100644 --- 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 ipoib_endpt_t* ipoib_endpt_create( + IN const ipoib_port_t* const p_port, IN const ib_gid_t* const p_dgid, IN const net16_t dlid, IN const net32_t qpn ); diff --git a/trunk/ulp/ipoib_NDIS6_CM/kernel/ipoib_port.cpp b/trunk/ulp/ipoib_NDIS6_CM/kernel/ipoib_port.cpp index a19b06af..d7b452e8 100644 --- 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( /* Create the endpoint. */ *pp_src = ipoib_endpt_create( + p_port, #if IPOIB_INLINE_RECV &p_desc->buf.ib.grh.src_gid, #else @@ -2968,7 +2969,8 @@ __recv_arp( /* * Create the endpoint. */ - *pp_src = ipoib_endpt_create( &p_ib_arp->src_hw.gid, + *pp_src = ipoib_endpt_create( p_port, + &p_ib_arp->src_hw.gid, p_wc->recv.ud.remote_lid, ipoib_addr_get_qpn( &p_ib_arp->src_hw ) ); if( !*pp_src ) @@ -6797,7 +6799,8 @@ __endpt_mgr_add_bcast( p_port->ib_mgr.bcast_rec = *p_mcast_rec->p_member_rec; /* Allocate the broadcast endpoint. */ - p_endpt = ipoib_endpt_create( &p_mcast_rec->p_member_rec->mgid, + p_endpt = ipoib_endpt_create( p_port, + &p_mcast_rec->p_member_rec->mgid, 0, CL_HTON32(0x00FFFFFF) ); if( !p_endpt ) @@ -7055,7 +7058,7 @@ __endpt_mgr_add_local( IPOIB_ENTER( IPOIB_DBG_INIT ); ib_gid_set_default( &gid, p_port->p_adapter->guids.port_guid.guid ); - p_endpt = ipoib_endpt_create( &gid, p_port_info->base_lid, p_port->ib_mgr.qpn ); + p_endpt = ipoib_endpt_create( p_port, &gid, p_port_info->base_lid, p_port->ib_mgr.qpn ); if( !p_endpt ) { p_port->p_adapter->hung = TRUE; @@ -7832,7 +7835,8 @@ ipoib_port_join_mcast( * mcast callback is invoked, it would not find the corresponding endpoint * and would be undone. */ - p_endpt = ipoib_endpt_create( &mcast_req.member_rec.mgid, + p_endpt = ipoib_endpt_create( p_port, + &mcast_req.member_rec.mgid, 0, CL_HTON32(0x00FFFFFF) ); if( !p_endpt ) -- 2.46.0