[openib-general] [PATCH][1/19] kDAPL: Remove typedef DAT_IA_ADDRESS_PTR
Tom Duffy
Tom.Duffy at Sun.COM
Sun May 15 11:27:15 PDT 2005
Signed-off-by: Tom Duffy <tduffy at sun.com>
Index: linux-kernel/test/dapltest/test/dapl_performance_util.c
===================================================================
--- linux-kernel/test/dapltest/test/dapl_performance_util.c (revision 2338)
+++ linux-kernel/test/dapltest/test/dapl_performance_util.c (working copy)
@@ -34,7 +34,7 @@ boolean_t
DT_Performance_Test_Create (
Per_Test_Data_t *pt_ptr,
DAT_IA_HANDLE *ia_handle,
- DAT_IA_ADDRESS_PTR remote_ia_addr,
+ struct sockaddr * remote_ia_addr,
boolean_t is_server,
boolean_t is_remote_little_endian,
Performance_Test_t **perf_test)
Index: linux-kernel/test/dapltest/test/dapl_performance_client.c
===================================================================
--- linux-kernel/test/dapltest/test/dapl_performance_client.c (revision 2338)
+++ linux-kernel/test/dapltest/test/dapl_performance_client.c (working copy)
@@ -35,7 +35,7 @@ DT_Performance_Test_Client (
Params_t *params_ptr,
Per_Test_Data_t *pt_ptr,
DAT_IA_HANDLE *ia_handle,
- DAT_IA_ADDRESS_PTR remote_ia_addr)
+ struct sockaddr * remote_ia_addr)
{
Performance_Test_t *test_ptr = NULL;
int connected = 1;
Index: linux-kernel/test/dapltest/test/dapl_transaction_test.c
===================================================================
--- linux-kernel/test/dapltest/test/dapl_transaction_test.c (revision 2338)
+++ linux-kernel/test/dapltest/test/dapl_transaction_test.c (working copy)
@@ -48,7 +48,7 @@
int
DT_Transaction_Test_Client (Per_Test_Data_t * pt_ptr,
DAT_IA_HANDLE ia_handle,
- DAT_IA_ADDRESS_PTR remote_ia_addr)
+ struct sockaddr *remote_ia_addr)
{
Transaction_Cmd_t *cmd = &pt_ptr->Params.u.Transaction_Cmd;
unsigned int i;
@@ -114,7 +114,7 @@ DT_Transaction_Test_Server (void *params
TRUE,
port_num,
pt_ptr->Client_Info.is_little_endian,
- (DAT_IA_ADDRESS_PTR) 0))
+ (struct sockaddr *) 0))
{
DT_Tdep_PT_Printf (phead, "Server: Cannot Create Test!\n");
status = 1;
@@ -162,7 +162,7 @@ DT_Transaction_Create_Test (Per_Test_Dat
boolean_t is_server,
unsigned int port_num,
boolean_t remote_is_little_endian,
- DAT_IA_ADDRESS_PTR remote_ia_addr)
+ struct sockaddr *remote_ia_addr)
{
Transaction_Test_t *test_ptr;
DT_Tdep_Print_Head *phead;
Index: linux-kernel/test/dapltest/test/dapl_performance_server.c
===================================================================
--- linux-kernel/test/dapltest/test/dapl_performance_server.c (revision 2338)
+++ linux-kernel/test/dapltest/test/dapl_performance_server.c (working copy)
@@ -42,7 +42,7 @@ DT_Performance_Test_Server (
if ( !DT_Performance_Test_Create (pt_ptr,
pt_ptr->ps_ptr->ia_handle,
- (DAT_IA_ADDRESS_PTR) 0,
+ (struct sockaddr *) 0,
TRUE,
pt_ptr->Client_Info.is_little_endian,
&test_ptr) )
Index: linux-kernel/test/dapltest/test/dapl_client.c
===================================================================
--- linux-kernel/test/dapltest/test/dapl_client.c (revision 2338)
+++ linux-kernel/test/dapltest/test/dapl_client.c (working copy)
@@ -53,7 +53,7 @@ DT_cs_Client (Params_t * params_ptr,
Quit_Cmd_t *Quit_Cmd = NULL;
Performance_Cmd_t *Performance_Cmd = NULL;
Bpool *bpool = NULL;
- DAT_IA_ADDRESS_PTR server_netaddr = NULL;
+ struct sockaddr * server_netaddr = NULL;
unsigned char *module = "DT_cs_Client";
unsigned int did_connect = 0;
unsigned int try_connect = 0;
Index: linux-kernel/test/dapltest/include/dapl_performance_test.h
===================================================================
--- linux-kernel/test/dapltest/include/dapl_performance_test.h (revision 2338)
+++ linux-kernel/test/dapltest/include/dapl_performance_test.h (working copy)
@@ -66,7 +66,7 @@ typedef struct
{
Per_Test_Data_t *pt_ptr;
Performance_Cmd_t *cmd;
- DAT_IA_ADDRESS_PTR remote_ia_addr;
+ struct sockaddr * remote_ia_addr;
boolean_t is_remote_little_endian;
DAT_CONN_QUAL base_port;
struct dat_ia_attr ia_attr;
Index: linux-kernel/test/dapltest/include/dapl_proto.h
===================================================================
--- linux-kernel/test/dapltest/include/dapl_proto.h (revision 2338)
+++ linux-kernel/test/dapltest/include/dapl_proto.h (working copy)
@@ -208,13 +208,13 @@ void DT_MemListFree (Per_Test
void DT_PrintMemList (Per_Test_Data_t * pt_ptr);
/* dapl_netaddr.c */
-boolean_t DT_NetAddrLookupHostAddress (DAT_IA_ADDRESS_PTR to_netaddr,
+boolean_t DT_NetAddrLookupHostAddress (struct sockaddr *to_netaddr,
char *hostname);
-DAT_IA_ADDRESS_PTR DT_NetAddrAlloc (Per_Test_Data_t * pt_ptr);
+struct sockaddr *DT_NetAddrAlloc (Per_Test_Data_t * pt_ptr);
void DT_NetAddrFree (Per_Test_Data_t * pt_ptr,
- DAT_IA_ADDRESS_PTR netaddr);
+ struct sockaddr *netaddr);
/* dapl_params.c */
boolean_t DT_Params_Parse (int argc,
@@ -241,7 +241,7 @@ void DT_Performance_Cmd_Endia
int DT_Performance_Test_Client ( Params_t *params_ptr,
Per_Test_Data_t * pt_ptr,
DAT_IA_HANDLE * ia_handle,
- DAT_IA_ADDRESS_PTR remote);
+ struct sockaddr *remote);
boolean_t DT_Performance_Test_Client_Connect (
DT_Tdep_Print_Head *phead,
@@ -266,7 +266,7 @@ boolean_t DT_Performance_Test
/* dapl_performance_util.c */
boolean_t DT_Performance_Test_Create (Per_Test_Data_t * pt_ptr,
DAT_IA_HANDLE * ia_handle,
- DAT_IA_ADDRESS_PTR remote_ia_addr,
+ struct sockaddr *remote_ia_addr,
boolean_t is_server,
boolean_t is_remote_little_endian,
Performance_Test_t **perf_test);
@@ -465,7 +465,7 @@ void DT_Transaction_Cmd_Endia
/* dapl_transaction_test.c */
int DT_Transaction_Test_Client (Per_Test_Data_t * pt_ptr,
DAT_IA_HANDLE ia_handle,
- DAT_IA_ADDRESS_PTR remote);
+ struct sockaddr *remote);
void DT_Transaction_Test_Server (void *params);
@@ -474,7 +474,7 @@ boolean_t DT_Transaction_Crea
boolean_t is_server,
unsigned int port_num,
boolean_t remote_is_little_endian,
- DAT_IA_ADDRESS_PTR remote_ia_addr);
+ struct sockaddr *remote_ia_addr);
void DT_Transaction_Main (void *param);
boolean_t DT_Transaction_Run (DT_Tdep_Print_Head* phead,
Index: linux-kernel/test/dapltest/include/dapl_fft_util.h
===================================================================
--- linux-kernel/test/dapltest/include/dapl_fft_util.h (revision 2338)
+++ linux-kernel/test/dapltest/include/dapl_fft_util.h (working copy)
@@ -66,7 +66,7 @@ typedef struct
Bpool *bpool;
struct dat_cr_arrival_event_data cr_stat;
DAT_EVENT_NUMBER event_num;
- DAT_IA_ADDRESS_PTR remote_netaddr;
+ struct sockaddr *remote_netaddr;
Per_Test_Data_t *pt_ptr;
boolean_t connected;
} FFT_Connection_t;
Index: linux-kernel/test/dapltest/include/dapl_transaction_test.h
===================================================================
--- linux-kernel/test/dapltest/include/dapl_transaction_test.h (revision 2338)
+++ linux-kernel/test/dapltest/include/dapl_transaction_test.h (working copy)
@@ -77,7 +77,7 @@ typedef struct
Per_Test_Data_t *pt_ptr;
DAT_IA_HANDLE ia_handle;
Transaction_Cmd_t *cmd;
- DAT_IA_ADDRESS_PTR remote_ia_addr;
+ struct sockaddr * remote_ia_addr;
DAT_CONN_QUAL base_port;
DAT_TIMEOUT time_out;
int evd_length;
Index: linux-kernel/test/dapltest/cmd/dapl_netaddr.c
===================================================================
--- linux-kernel/test/dapltest/cmd/dapl_netaddr.c (revision 2338)
+++ linux-kernel/test/dapltest/cmd/dapl_netaddr.c (working copy)
@@ -27,12 +27,12 @@
#include "dapl_proto.h"
-DAT_IA_ADDRESS_PTR
+struct sockaddr *
DT_NetAddrAlloc (Per_Test_Data_t * pt_ptr)
{
- DAT_IA_ADDRESS_PTR netaddr;
+ struct sockaddr *netaddr;
- netaddr = (DAT_IA_ADDRESS_PTR) DT_Mdep_Malloc (sizeof (struct sockaddr));
+ netaddr = (struct sockaddr *) DT_Mdep_Malloc (sizeof (struct sockaddr));
if (!netaddr)
{
DT_Mdep_printf ("dapltest: No Memory to create netaddr!\n");
@@ -42,14 +42,14 @@ DT_NetAddrAlloc (Per_Test_Data_t * pt_pt
void
-DT_NetAddrFree (Per_Test_Data_t * pt_ptr, DAT_IA_ADDRESS_PTR netaddr)
+DT_NetAddrFree (Per_Test_Data_t * pt_ptr, struct sockaddr *netaddr)
{
DT_Mdep_Free (netaddr);
}
boolean_t
-DT_NetAddrLookupHostAddress (DAT_IA_ADDRESS_PTR to_netaddr,
+DT_NetAddrLookupHostAddress (struct sockaddr * to_netaddr,
char * hostname)
{
struct addrinfo *target;
@@ -137,7 +137,7 @@ DT_NetAddrLookupHostAddress (DAT_IA_ADDR
(rval >> 16) & 0xff,
(rval >> 24) & 0xff);
- *to_netaddr = * ((DAT_IA_ADDRESS_PTR) target->ai_addr);
+ *to_netaddr = * ((struct sockaddr *) target->ai_addr);
return ( TRUE );
}
Index: linux-kernel/dat-provider/dapl_ep_connect.c
===================================================================
--- linux-kernel/dat-provider/dapl_ep_connect.c (revision 2338)
+++ linux-kernel/dat-provider/dapl_ep_connect.c (working copy)
@@ -43,7 +43,7 @@
* side of a connection
*/
u32 dapl_ep_connect(DAT_EP_HANDLE ep_handle,
- DAT_IA_ADDRESS_PTR remote_ia_address,
+ struct sockaddr *remote_ia_address,
DAT_CONN_QUAL remote_conn_qual, DAT_TIMEOUT timeout,
int private_data_size, const void *private_data,
DAT_QOS qos, DAT_CONNECT_FLAGS connect_flags)
Index: linux-kernel/dat-provider/dapl_cr_callback.c
===================================================================
--- linux-kernel/dat-provider/dapl_cr_callback.c (revision 2338)
+++ linux-kernel/dat-provider/dapl_cr_callback.c (working copy)
@@ -286,8 +286,8 @@ u32 dapl_connection_request(ib_cm_handle
*/
cr_ptr->sp_ptr = sp_ptr; /* maintain sp_ptr in case of reject */
cr_ptr->ib_cm_handle = ib_cm_handle;
- cr_ptr->param.remote_ia_address_ptr =
- (DAT_IA_ADDRESS_PTR) &cr_ptr->remote_ia_address;
+ cr_ptr->param.remote_ia_address_ptr =
+ (struct sockaddr *)&cr_ptr->remote_ia_address;
cr_ptr->param.remote_port_qual = 0;
/* Private data size will be determined by the provider layer */
@@ -349,8 +349,8 @@ u32 dapl_connection_request(ib_cm_handle
dat_status = dapl_evd_post_cr_arrival_event(evd_ptr,
DAT_CONNECTION_REQUEST_EVENT,
sp_handle,
- (DAT_IA_ADDRESS_PTR) &
- sp_ptr->header.owner_ia->
+ (struct sockaddr *)
+ &sp_ptr->header.owner_ia->
hca_ptr->hca_address,
sp_ptr->conn_qual,
(DAT_CR_HANDLE) cr_ptr);
Index: linux-kernel/dat-provider/dapl_ep_create.c
===================================================================
--- linux-kernel/dat-provider/dapl_ep_create.c (revision 2338)
+++ linux-kernel/dat-provider/dapl_ep_create.c (working copy)
@@ -204,9 +204,9 @@ u32 dapl_ep_create(DAT_IA_HANDLE ia_hand
ep_ptr->param.ia_handle = ia_handle;
ep_ptr->param.ep_state = DAT_EP_STATE_UNCONNECTED;
ep_ptr->param.local_ia_address_ptr =
- (DAT_IA_ADDRESS_PTR) & ia_ptr->hca_ptr->hca_address;
+ (struct sockaddr *)&ia_ptr->hca_ptr->hca_address;
/* Set the remote address pointer to the end of the EP struct */
- ep_ptr->param.remote_ia_address_ptr = (DAT_IA_ADDRESS_PTR) (ep_ptr + 1);
+ ep_ptr->param.remote_ia_address_ptr = (struct sockaddr *) (ep_ptr + 1);
ep_ptr->param.pz_handle = pz_handle;
ep_ptr->param.recv_evd_handle = recv_evd_handle;
Index: linux-kernel/dat-provider/dapl_adapter_util.h
===================================================================
--- linux-kernel/dat-provider/dapl_adapter_util.h (revision 2338)
+++ linux-kernel/dat-provider/dapl_adapter_util.h (working copy)
@@ -67,7 +67,7 @@ u32 dapl_ib_qp_modify(DAPL_IA *ia_ptr, D
struct dat_ep_attr *ep_attr);
u32 dapl_ib_connect(DAT_EP_HANDLE ep_handle,
- DAT_IA_ADDRESS_PTR remote_ia_address,
+ struct sockaddr *remote_ia_address,
DAT_CONN_QUAL remote_conn_qual,
int private_data_size, void *private_data);
Index: linux-kernel/dat-provider/dapl_ep_query.c
===================================================================
--- linux-kernel/dat-provider/dapl_ep_query.c (revision 2338)
+++ linux-kernel/dat-provider/dapl_ep_query.c (working copy)
@@ -94,7 +94,7 @@ u32 dapl_ep_query(DAT_EP_HANDLE ep_handl
&ep_ptr->remote_ia_address);
}
ep_ptr->param.remote_ia_address_ptr =
- (DAT_IA_ADDRESS_PTR) & ep_ptr->remote_ia_address;
+ (struct sockaddr *)&ep_ptr->remote_ia_address;
*ep_param = ep_ptr->param;
bail:
Index: linux-kernel/dat-provider/dapl_openib_cm.c
===================================================================
--- linux-kernel/dat-provider/dapl_openib_cm.c (revision 2338)
+++ linux-kernel/dat-provider/dapl_openib_cm.c (working copy)
@@ -393,7 +393,7 @@ error:
*
*/
u32 dapl_ib_connect(DAT_EP_HANDLE ep_handle,
- DAT_IA_ADDRESS_PTR remote_ia_address,
+ struct sockaddr *remote_ia_address,
DAT_CONN_QUAL remote_conn_qual,
int private_data_size, void *private_data)
{
Index: linux-kernel/dat-provider/dapl_openib_util.c
===================================================================
--- linux-kernel/dat-provider/dapl_openib_util.c (revision 2338)
+++ linux-kernel/dat-provider/dapl_openib_util.c (working copy)
@@ -722,7 +722,7 @@ u32 dapl_ib_query_hca(DAPL_HCA *hca_ptr,
VN_VENDOR_NAME, DAT_NAME_MAX_LENGTH);
ia_attr->ia_address_ptr =
- (DAT_IA_ADDRESS_PTR) & hca_ptr->hca_address;
+ (struct sockaddr *)&hca_ptr->hca_address;
ia_attr->hardware_version_major = device_attr.hw_ver;
ia_attr->hardware_version_minor = 0;
ia_attr->firmware_version_major = device_attr.fw_ver;
Index: linux-kernel/dat-provider/dapl_ep_create_with_srq.c
===================================================================
--- linux-kernel/dat-provider/dapl_ep_create_with_srq.c (revision 2338)
+++ linux-kernel/dat-provider/dapl_ep_create_with_srq.c (working copy)
@@ -231,9 +231,9 @@ u32 dapl_ep_create_with_srq(DAT_IA_HANDL
ep_ptr->param.ia_handle = ia_handle;
ep_ptr->param.ep_state = DAT_EP_STATE_UNCONNECTED;
ep_ptr->param.local_ia_address_ptr =
- (DAT_IA_ADDRESS_PTR) & ia_ptr->hca_ptr->hca_address;
+ (struct sockaddr *)&ia_ptr->hca_ptr->hca_address;
/* Set the remote address pointer to the end of the EP struct */
- ep_ptr->param.remote_ia_address_ptr = (DAT_IA_ADDRESS_PTR) (ep_ptr + 1);
+ ep_ptr->param.remote_ia_address_ptr = (struct sockaddr *) (ep_ptr + 1);
ep_ptr->param.pz_handle = pz_handle;
ep_ptr->param.recv_evd_handle = recv_evd_handle;
Index: linux-kernel/dat-provider/dapl_evd_util.c
===================================================================
--- linux-kernel/dat-provider/dapl_evd_util.c (revision 2338)
+++ linux-kernel/dat-provider/dapl_evd_util.c (working copy)
@@ -500,7 +500,7 @@ static struct dat_event *dapl_evd_get_an
u32 dapl_evd_post_cr_arrival_event(DAPL_EVD *evd_ptr,
DAT_EVENT_NUMBER event_number,
DAT_SP_HANDLE sp_handle,
- DAT_IA_ADDRESS_PTR ia_address_ptr,
+ struct sockaddr *ia_address_ptr,
DAT_CONN_QUAL conn_qual,
DAT_CR_HANDLE cr_handle)
{
Index: linux-kernel/dat-provider/dapl_evd_util.h
===================================================================
--- linux-kernel/dat-provider/dapl_evd_util.h (revision 2338)
+++ linux-kernel/dat-provider/dapl_evd_util.h (working copy)
@@ -65,7 +65,7 @@ u32 dapl_evd_event_realloc(DAPL_EVD *evd
u32 dapl_evd_post_cr_arrival_event(DAPL_EVD *evd_ptr,
DAT_EVENT_NUMBER event_number,
DAT_SP_HANDLE sp_handle,
- DAT_IA_ADDRESS_PTR ia_address_ptr,
+ struct sockaddr *ia_address_ptr,
DAT_CONN_QUAL conn_qual,
DAT_CR_HANDLE cr_handle);
Index: linux-kernel/dat-provider/dapl_ep_dup_connect.c
===================================================================
--- linux-kernel/dat-provider/dapl_ep_dup_connect.c (revision 2338)
+++ linux-kernel/dat-provider/dapl_ep_dup_connect.c (working copy)
@@ -75,7 +75,7 @@ u32 dapl_ep_dup_connect(DAT_EP_HANDLE ep
{
DAPL_EP *ep_dup_ptr;
u32 dat_status;
- DAT_IA_ADDRESS_PTR remote_ia_address_ptr;
+ struct sockaddr *remote_ia_address_ptr;
DAT_CONN_QUAL remote_conn_qual;
ep_dup_ptr = (DAPL_EP *) ep_dup_handle;
Index: linux-kernel/dat-provider/dapl.h
===================================================================
--- linux-kernel/dat-provider/dapl.h (revision 2338)
+++ linux-kernel/dat-provider/dapl.h (working copy)
@@ -555,7 +555,7 @@ extern u32 dapl_ep_modify(DAT_EP_HANDLE
const struct dat_ep_param *ep_args);
extern u32 dapl_ep_connect(DAT_EP_HANDLE ep_handle,
- DAT_IA_ADDRESS_PTR remote_ia_address,
+ struct sockaddr *remote_ia_address,
DAT_CONN_QUAL remote_conn_qual,
DAT_TIMEOUT timeout,
int private_data_size,
Index: linux-kernel/dat/dat.h
===================================================================
--- linux-kernel/dat/dat.h (revision 2338)
+++ linux-kernel/dat/dat.h (working copy)
@@ -408,8 +408,6 @@ typedef DAT_HANDLE DAT_SRQ_HANDLE;
#define DAT_HANDLE_NULL ((DAT_HANDLE)NULL)
-typedef struct sockaddr *DAT_IA_ADDRESS_PTR;
-
typedef u64 DAT_CONN_QUAL;
typedef u64 DAT_PORT_QUAL;
@@ -603,9 +601,9 @@ typedef enum dat_ep_state {
struct dat_ep_param {
DAT_IA_HANDLE ia_handle;
DAT_EP_STATE ep_state;
- DAT_IA_ADDRESS_PTR local_ia_address_ptr;
+ struct sockaddr *local_ia_address_ptr;
DAT_PORT_QUAL local_port_qual;
- DAT_IA_ADDRESS_PTR remote_ia_address_ptr;
+ struct sockaddr *remote_ia_address_ptr;
DAT_PORT_QUAL remote_port_qual;
DAT_PZ_HANDLE pz_handle;
DAT_EVD_HANDLE recv_evd_handle;
@@ -710,7 +708,7 @@ struct dat_rsp_param {
struct dat_cr_param {
/* Remote IA whose Endpoint requested the connection. */
- DAT_IA_ADDRESS_PTR remote_ia_address_ptr;
+ struct sockaddr *remote_ia_address_ptr;
/* Port qualifier of the remote Endpoint of the requested connection. */
DAT_PORT_QUAL remote_port_qual;
@@ -795,7 +793,7 @@ struct dat_cr_arrival_event_data {
DAT_SP_HANDLE sp_handle;
/* Address of the IA on which the Connection Request arrived. */
- DAT_IA_ADDRESS_PTR local_ia_address_ptr;
+ struct sockaddr *local_ia_address_ptr;
/* Connection Qualifier of the IA on which the Service Point received a
* Connection Request.
@@ -1002,7 +1000,7 @@ struct dat_ia_attr {
u32 hardware_version_minor;
u32 firmware_version_major;
u32 firmware_version_minor;
- DAT_IA_ADDRESS_PTR ia_address_ptr;
+ struct sockaddr *ia_address_ptr;
int max_eps;
int max_dto_per_ep;
int max_rdma_read_per_ep_in;
@@ -1149,7 +1147,7 @@ typedef u32 (*DAT_EP_QUERY_FUNC)(DAT_EP_
typedef u32 (*DAT_EP_MODIFY_FUNC)(DAT_EP_HANDLE, DAT_EP_PARAM_MASK,
const struct dat_ep_param *);
-typedef u32 (*DAT_EP_CONNECT_FUNC)(DAT_EP_HANDLE, DAT_IA_ADDRESS_PTR,
+typedef u32 (*DAT_EP_CONNECT_FUNC)(DAT_EP_HANDLE, struct sockaddr *,
DAT_CONN_QUAL, DAT_TIMEOUT, int,
const void *, DAT_QOS, DAT_CONNECT_FLAGS);
@@ -1496,7 +1494,7 @@ static inline u32 dat_evd_resize(DAT_EVD
return DAT_CALL_PROVIDER_FUNC(evd_resize_func, evd, qlen);
}
-static inline u32 dat_ep_connect(DAT_EP_HANDLE ep, DAT_IA_ADDRESS_PTR ia_addr,
+static inline u32 dat_ep_connect(DAT_EP_HANDLE ep, struct sockaddr *ia_addr,
DAT_CONN_QUAL conn_qual, DAT_TIMEOUT timeout,
int private_data_size,
const void *private_data, DAT_QOS qos,
More information about the general
mailing list