Signed-off-by: Tom Duffy <[EMAIL PROTECTED]>
diff -Nur -X /home/tduffy/dontdiff linux-kernel25/dat/dat.h
linux-kernel26/dat/dat.h
--- linux-kernel25/dat/dat.h 2005-05-09 14:08:31.214971000 -0700
+++ linux-kernel26/dat/dat.h 2005-05-09 14:12:56.760962000 -0700
@@ -43,8 +43,6 @@
typedef void * DAT_PVOID;
typedef int DAT_COUNT;
typedef u64 DAT_PADDR;
-typedef struct sockaddr DAT_SOCK_ADDR;
-typedef struct sockaddr_in6 DAT_SOCK_ADDR6;
/*
* All return codes are actually a 3-way tuple:
@@ -418,7 +416,7 @@
#define DAT_HANDLE_NULL ((DAT_HANDLE)NULL)
-typedef DAT_SOCK_ADDR *DAT_IA_ADDRESS_PTR;
+typedef struct sockaddr *DAT_IA_ADDRESS_PTR;
typedef u64 DAT_CONN_QUAL;
typedef u64 DAT_PORT_QUAL;
diff -Nur -X /home/tduffy/dontdiff
linux-kernel25/dat-provider/dapl_adapter_util.h
linux-kernel26/dat-provider/dapl_adapter_util.h
--- linux-kernel25/dat-provider/dapl_adapter_util.h 2005-05-09
14:09:01.530972000 -0700
+++ linux-kernel26/dat-provider/dapl_adapter_util.h 2005-05-09
14:13:10.187965000 -0700
@@ -148,7 +148,7 @@
DAT_RETURN dapl_ib_query_hca(DAPL_HCA * hca_ptr,
struct dat_ia_attr *ia_attr,
struct dat_ep_attr *ep_attr,
- DAT_SOCK_ADDR6 * ip_addr);
+ struct sockaddr_in6 *ip_addr);
DAT_RETURN dapl_ib_completion_poll(DAPL_HCA * hca_ptr,
DAPL_EVD * evd_ptr,
@@ -175,7 +175,7 @@
ib_cm_events_t dapl_ib_get_cm_event(DAT_EVENT_NUMBER dat_event_num);
DAT_RETURN dapl_ib_cm_remote_addr(DAT_HANDLE dat_handle,
- DAT_SOCK_ADDR6 * remote_ia_address);
+ struct sockaddr_in6 *remote_ia_address);
/*
diff -Nur -X /home/tduffy/dontdiff
linux-kernel25/dat-provider/dapl_ep_connect.c
linux-kernel26/dat-provider/dapl_ep_connect.c
--- linux-kernel25/dat-provider/dapl_ep_connect.c 2005-05-02
08:48:16.984961000 -0700
+++ linux-kernel26/dat-provider/dapl_ep_connect.c 2005-05-09
14:14:07.867963000 -0700
@@ -237,8 +237,8 @@
spin_unlock(&ep_ptr->header.lock);
/* Copy the connection qualifiers */
- memcpy(ep_ptr->param.remote_ia_address_ptr,
- remote_ia_address, sizeof(DAT_SOCK_ADDR));
+ memcpy(ep_ptr->param.remote_ia_address_ptr, remote_ia_address,
+ sizeof *(ep_ptr->param.remote_ia_address_ptr));
ep_ptr->param.remote_port_qual = remote_conn_qual;
memcpy(ep_ptr->private_data,private_data,private_data_size);
diff -Nur -X /home/tduffy/dontdiff linux-kernel25/dat-provider/dapl_ep_util.c
linux-kernel26/dat-provider/dapl_ep_util.c
--- linux-kernel25/dat-provider/dapl_ep_util.c 2005-05-09 12:21:06.403014000
-0700
+++ linux-kernel26/dat-provider/dapl_ep_util.c 2005-05-09 14:12:24.073960000
-0700
@@ -80,14 +80,14 @@
DAPL_EP *ep_ptr;
/* Allocate EP */
- ep_ptr = (DAPL_EP *) kmalloc(sizeof(DAPL_EP) + sizeof(DAT_SOCK_ADDR),
+ ep_ptr = (DAPL_EP *) kmalloc(sizeof(DAPL_EP) + sizeof(struct sockaddr),
GFP_ATOMIC);
if (ep_ptr == NULL) {
goto bail;
}
/* zero the structure */
- memset(ep_ptr, 0, sizeof(DAPL_EP) + sizeof(DAT_SOCK_ADDR));
+ memset(ep_ptr, 0, sizeof(DAPL_EP) + sizeof(struct sockaddr));
/*
* initialize the header
diff -Nur -X /home/tduffy/dontdiff linux-kernel25/dat-provider/dapl.h
linux-kernel26/dat-provider/dapl.h
--- linux-kernel25/dat-provider/dapl.h 2005-05-09 14:08:06.217043000 -0700
+++ linux-kernel26/dat-provider/dapl.h 2005-05-09 14:11:58.543960000 -0700
@@ -213,7 +213,7 @@
atomic_t handle_ref_count; /* count of ia_opens on handle */
DAPL_EVD *async_evd;
DAPL_EVD *async_error_evd;
- DAT_SOCK_ADDR6 hca_address; /* local address of HCA */
+ struct sockaddr_in6 hca_address; /* local address of HCA */
char *name; /* provider name */
ib_hca_handle_t ib_hca_handle;
u8 port_num; /* number of physical port */
@@ -314,7 +314,7 @@
/* store the remote IA address here, reference from the param
* struct which only has a pointer, no storage
*/
- DAT_SOCK_ADDR6 remote_ia_address;
+ struct sockaddr_in6 remote_ia_address;
/* For passive connections we maintain a back pointer to the CR */
void *cr_ptr;
@@ -414,7 +414,7 @@
/* IB specific fields */
ib_cm_handle_t ib_cm_handle;
- DAT_SOCK_ADDR6 remote_ia_address;
+ struct sockaddr_in6 remote_ia_address;
/* Assuming that the maximum private data size is small.
* If it gets large, use of a pointer may be appropriate.
*/
diff -Nur -X /home/tduffy/dontdiff linux-kernel25/dat-provider/dapl_openib_cm.c
linux-kernel26/dat-provider/dapl_openib_cm.c
--- linux-kernel25/dat-provider/dapl_openib_cm.c 2005-05-06
16:22:03.000009000 -0700
+++ linux-kernel26/dat-provider/dapl_openib_cm.c 2005-05-09
14:15:24.898964000 -0700
@@ -812,7 +812,7 @@
*
*/
DAT_RETURN dapl_ib_cm_remote_addr(DAT_HANDLE dat_handle,
- DAT_SOCK_ADDR6 * remote_ia_address)
+ struct sockaddr_in6 *remote_ia_address)
{
DAPL_IA *ia_ptr;
int rc;
@@ -828,7 +828,7 @@
if (!memcmp(&ia_ptr->hca_ptr->ib_trans.gid, &remote_gid, 16)) {
memcpy(remote_ia_address, &ia_ptr->hca_ptr->hca_address,
- sizeof(DAT_SOCK_ADDR));
+ sizeof(struct sockaddr));
return DAT_SUCCESS;
}
diff -Nur -X /home/tduffy/dontdiff
linux-kernel25/dat-provider/dapl_openib_util.c
linux-kernel26/dat-provider/dapl_openib_util.c
--- linux-kernel25/dat-provider/dapl_openib_util.c 2005-05-09
14:09:32.103960000 -0700
+++ linux-kernel26/dat-provider/dapl_openib_util.c 2005-05-09
14:15:36.673960000 -0700
@@ -748,7 +748,7 @@
DAT_RETURN dapl_ib_query_hca(DAPL_HCA * hca_ptr,
struct dat_ia_attr *ia_attr,
struct dat_ep_attr *ep_attr,
- DAT_SOCK_ADDR6 * ip_addr)
+ struct sockaddr_in6 *ip_addr)
{
int ib_status;
struct ib_device_attr device_attr;
diff -Nur -X /home/tduffy/dontdiff
linux-kernel25/test/dapltest/cmd/dapl_netaddr.c
linux-kernel26/test/dapltest/cmd/dapl_netaddr.c
--- linux-kernel25/test/dapltest/cmd/dapl_netaddr.c 2005-04-06
22:02:37.114981000 -0700
+++ linux-kernel26/test/dapltest/cmd/dapl_netaddr.c 2005-05-09
14:12:24.095963000 -0700
@@ -32,7 +32,7 @@
{
DAT_IA_ADDRESS_PTR netaddr;
- netaddr = (DAT_IA_ADDRESS_PTR) DT_Mdep_Malloc (sizeof (DAT_SOCK_ADDR));
+ netaddr = (DAT_IA_ADDRESS_PTR) DT_Mdep_Malloc (sizeof (struct sockaddr));
if (!netaddr)
{
DT_Mdep_printf ("dapltest: No Memory to create netaddr!\n");
diff -Nur -X /home/tduffy/dontdiff
linux-kernel25/test/dapltest/include/dapl_params.h
linux-kernel26/test/dapltest/include/dapl_params.h
--- linux-kernel25/test/dapltest/include/dapl_params.h 2005-05-05
09:42:06.763028000 -0700
+++ linux-kernel26/test/dapltest/include/dapl_params.h 2005-05-09
14:12:24.103960000 -0700
@@ -62,7 +62,7 @@
/* Needed here due to structure of command processing */
DAT_QOS ReliabilityLevel;
- DAT_SOCK_ADDR server_netaddr;
+ struct sockaddr server_netaddr;
void * phead;
bool local_is_little_endian;
bool debug;
diff -Nur -X /home/tduffy/dontdiff
linux-kernel25/test/dapltest/test/dapl_test_util.c
linux-kernel26/test/dapltest/test/dapl_test_util.c
--- linux-kernel25/test/dapltest/test/dapl_test_util.c 2005-05-09
13:31:50.623960000 -0700
+++ linux-kernel26/test/dapltest/test/dapl_test_util.c 2005-05-09
14:11:58.578962000 -0700
@@ -72,7 +72,7 @@
*/
if (DT_dapltest_debug)
{
- DAT_SOCK_ADDR6 *ip6_addr;
+ struct sockaddr_in6 *ip6_addr;
struct sockaddr_in *ip_addr;
DT_Tdep_PT_Printf (phead, "***** DAPL Characteristics *****\n");
@@ -111,7 +111,7 @@
DT_Tdep_PT_Printf (phead, "\tMaximum Private data size %d bytes\n",
pt_ptr->provider_attr.max_private_data_size );
- ip6_addr = (DAT_SOCK_ADDR6 *)pt_ptr->ia_attr.ia_address_ptr;
+ ip6_addr = (struct sockaddr_in6 *)pt_ptr->ia_attr.ia_address_ptr;
if (ip6_addr->sin6_family == AF_INET6 )
{
DT_Tdep_PT_Printf (phead, "\tLocal IP address
%x:%x:%x:%x:%x:%x:%x:%x:\n",
_______________________________________________
openib-general mailing list
[email protected]
http://openib.org/mailman/listinfo/openib-general
To unsubscribe, please visit http://openib.org/mailman/listinfo/openib-general
