[openib-general] [PATCH][SDP] rename struct sdp_opt to sdp_sock
Tom Duffy
tduffy at sun.com
Wed Apr 27 11:16:34 PDT 2005
This seem to be what all the cool kids are doing these days.
Applies after my 2.6.12-rc3 fixup patch.
Signed-off-by: Tom Duffy <tduffy at sun.com>
diff -up linux-2.6.12-rc3-openib/drivers/infiniband/ulp/sdp.pre/sdp_actv.c linux-2.6.12-rc3-openib/drivers/infiniband/ulp/sdp/sdp_actv.c
--- linux-2.6.12-rc3-openib/drivers/infiniband/ulp/sdp.pre/sdp_actv.c 2005-04-25 21:02:06.073010000 -0700
+++ linux-2.6.12-rc3-openib/drivers/infiniband/ulp/sdp/sdp_actv.c 2005-04-26 21:28:40.305963000 -0700
@@ -37,7 +37,7 @@
/*
* Connection establishment functions
*/
-void sdp_cm_actv_error(struct sdp_opt *conn, int error)
+void sdp_cm_actv_error(struct sdp_sock *conn, int error)
{
int result;
struct sock *sk;
@@ -108,7 +108,7 @@ void sdp_cm_actv_error(struct sdp_opt *c
/*
* sdp_cm_actv_establish - process an accepted connection request.
*/
-static int sdp_cm_actv_establish(struct sdp_opt *conn)
+static int sdp_cm_actv_establish(struct sdp_sock *conn)
{
struct ib_qp_attr *qp_attr;
int attr_mask = 0;
@@ -271,7 +271,7 @@ static int sdp_cm_hello_ack_check(struct
* sdp_cm_rep_handler - handler for active connection open completion
*/
int sdp_cm_rep_handler(struct ib_cm_id *cm_id, struct ib_cm_event *event,
- struct sdp_opt *conn)
+ struct sdp_sock *conn)
{
struct sdp_msg_hello_ack *hello_ack;
int result = -EPROTO;
@@ -351,7 +351,7 @@ static void sdp_cm_path_complete(u64 id,
{
struct ib_cm_req_param param;
struct sdp_msg_hello *hello_msg;
- struct sdp_opt *conn = (struct sdp_opt *) arg;
+ struct sdp_sock *conn = (struct sdp_sock *) arg;
struct sdpc_buff *buff;
int result = 0;
int expect;
@@ -531,7 +531,7 @@ done:
/*
* sdp_cm_connect - initiate a SDP connection with a hello message.
*/
-int sdp_cm_connect(struct sdp_opt *conn)
+int sdp_cm_connect(struct sdp_sock *conn)
{
int result;
/*
diff -up linux-2.6.12-rc3-openib/drivers/infiniband/ulp/sdp.pre/sdp_conn.c linux-2.6.12-rc3-openib/drivers/infiniband/ulp/sdp/sdp_conn.c
--- linux-2.6.12-rc3-openib/drivers/infiniband/ulp/sdp.pre/sdp_conn.c 2005-04-26 16:47:31.580003000 -0700
+++ linux-2.6.12-rc3-openib/drivers/infiniband/ulp/sdp/sdp_conn.c 2005-04-26 21:28:40.323961000 -0700
@@ -76,10 +76,10 @@ static u32 sdp_psn_generate(void)
/*
* sdp_inet_accept_q_put - put a conn into a listen conn's accept Q.
*/
-int sdp_inet_accept_q_put(struct sdp_opt *listen_conn,
- struct sdp_opt *accept_conn)
+int sdp_inet_accept_q_put(struct sdp_sock *listen_conn,
+ struct sdp_sock *accept_conn)
{
- struct sdp_opt *next_conn;
+ struct sdp_sock *next_conn;
if (listen_conn->parent ||
accept_conn->parent ||
@@ -107,10 +107,10 @@ int sdp_inet_accept_q_put(struct sdp_opt
/*
* sdp_inet_accept_q_get - get a conn from a listen conn's accept Q.
*/
-struct sdp_opt *sdp_inet_accept_q_get(struct sdp_opt *listen_conn)
+struct sdp_sock *sdp_inet_accept_q_get(struct sdp_sock *listen_conn)
{
- struct sdp_opt *prev_conn;
- struct sdp_opt *accept_conn;
+ struct sdp_sock *prev_conn;
+ struct sdp_sock *accept_conn;
if (listen_conn->parent ||
!listen_conn->accept_next ||
@@ -146,10 +146,10 @@ struct sdp_opt *sdp_inet_accept_q_get(st
/*
* sdp_inet_accept_q_remove - remove a conn from a conn's accept Q.
*/
-int sdp_inet_accept_q_remove(struct sdp_opt *accept_conn)
+int sdp_inet_accept_q_remove(struct sdp_sock *accept_conn)
{
- struct sdp_opt *next_conn;
- struct sdp_opt *prev_conn;
+ struct sdp_sock *next_conn;
+ struct sdp_sock *prev_conn;
if (!accept_conn->parent)
return -EFAULT;
@@ -181,7 +181,7 @@ int sdp_inet_accept_q_remove(struct sdp_
/*
* sdp_inet_listen_start - start listening for new connections on a socket
*/
-int sdp_inet_listen_start(struct sdp_opt *conn)
+int sdp_inet_listen_start(struct sdp_sock *conn)
{
unsigned long flags;
@@ -214,9 +214,9 @@ int sdp_inet_listen_start(struct sdp_opt
/*
* sdp_inet_listen_stop - stop listening for new connections on a socket
*/
-int sdp_inet_listen_stop(struct sdp_opt *listen_conn)
+int sdp_inet_listen_stop(struct sdp_sock *listen_conn)
{
- struct sdp_opt *accept_conn;
+ struct sdp_sock *accept_conn;
int result;
unsigned long flags;
@@ -274,9 +274,9 @@ int sdp_inet_listen_stop(struct sdp_opt
/*
* sdp_inet_listen_lookup - lookup a connection in the listen list
*/
-struct sdp_opt *sdp_inet_listen_lookup(u32 addr, u16 port)
+struct sdp_sock *sdp_inet_listen_lookup(u32 addr, u16 port)
{
- struct sdp_opt *conn;
+ struct sdp_sock *conn;
unsigned long flags;
/*
* table lock
@@ -299,11 +299,11 @@ struct sdp_opt *sdp_inet_listen_lookup(u
/*
* sdp_inet_port_get - bind a socket to a port.
*/
-int sdp_inet_port_get(struct sdp_opt *conn, u16 port)
+int sdp_inet_port_get(struct sdp_sock *conn, u16 port)
{
struct sock *sk;
struct sock *srch;
- struct sdp_opt *look;
+ struct sdp_sock *look;
s32 counter;
s32 low_port;
s32 top_port;
@@ -421,7 +421,7 @@ done:
/*
* sdp_inet_port_put - unbind a socket from a port.
*/
-int sdp_inet_port_put(struct sdp_opt *conn)
+int sdp_inet_port_put(struct sdp_sock *conn)
{
unsigned long flags;
@@ -450,7 +450,7 @@ int sdp_inet_port_put(struct sdp_opt *co
/*
* sdp_inet_port_inherit - inherit a port from another socket (accept)
*/
-int sdp_inet_port_inherit(struct sdp_opt *parent, struct sdp_opt *child)
+int sdp_inet_port_inherit(struct sdp_sock *parent, struct sdp_sock *child)
{
int result;
unsigned long flags;
@@ -486,7 +486,7 @@ done:
/*
* sdp_conn_table_insert - insert a connection into the connection table
*/
-static int sdp_conn_table_insert(struct sdp_opt *conn)
+static int sdp_conn_table_insert(struct sdp_sock *conn)
{
u32 counter;
int result = -ENOMEM;
@@ -530,7 +530,7 @@ static int sdp_conn_table_insert(struct
/*
* sdp_conn_table_remove - remove a connection from the connection table
*/
-int sdp_conn_table_remove(struct sdp_opt *conn)
+int sdp_conn_table_remove(struct sdp_sock *conn)
{
int result = 0;
unsigned long flags;
@@ -567,9 +567,9 @@ done:
/*
* sdp_conn_table_lookup - look up connection in the connection table
*/
-struct sdp_opt *sdp_conn_table_lookup(s32 entry)
+struct sdp_sock *sdp_conn_table_lookup(s32 entry)
{
- struct sdp_opt *conn;
+ struct sdp_sock *conn;
unsigned long flags;
/*
* lock table
@@ -617,7 +617,7 @@ static void sdp_desc_q_cancel_iocb(struc
}
}
-void sdp_iocb_q_cancel_all_read(struct sdp_opt *conn, ssize_t error)
+void sdp_iocb_q_cancel_all_read(struct sdp_sock *conn, ssize_t error)
{
sdp_iocb_q_cancel(&conn->r_pend, SDP_IOCB_F_ALL, error);
sdp_iocb_q_cancel(&conn->r_snk, SDP_IOCB_F_ALL, error);
@@ -625,7 +625,7 @@ void sdp_iocb_q_cancel_all_read(struct s
sdp_desc_q_cancel_iocb(&conn->r_src, error);
}
-void sdp_iocb_q_cancel_all_write(struct sdp_opt *conn, ssize_t error)
+void sdp_iocb_q_cancel_all_write(struct sdp_sock *conn, ssize_t error)
{
sdp_iocb_q_cancel(&conn->w_src, SDP_IOCB_F_ALL, error);
@@ -633,7 +633,7 @@ void sdp_iocb_q_cancel_all_write(struct
sdp_desc_q_cancel_iocb(&conn->w_snk, error);
}
-void sdp_iocb_q_cancel_all(struct sdp_opt *conn, ssize_t error)
+void sdp_iocb_q_cancel_all(struct sdp_sock *conn, ssize_t error)
{
sdp_iocb_q_cancel_all_read(conn, error);
sdp_iocb_q_cancel_all_write(conn, error);
@@ -646,7 +646,7 @@ void sdp_iocb_q_cancel_all(struct sdp_op
/*
* sdp_conn_destruct - final destructor for connection.
*/
-void sdp_conn_destruct(struct sdp_opt *conn)
+void sdp_conn_destruct(struct sdp_sock *conn)
{
int dump = 0;
int result;
@@ -761,7 +761,7 @@ void sdp_conn_destruct(struct sdp_opt *c
/*
* sdp_conn_internal_lock - lock the connection (use only from macro)
*/
-void sdp_conn_internal_lock(struct sdp_opt *conn, unsigned long *flags)
+void sdp_conn_internal_lock(struct sdp_sock *conn, unsigned long *flags)
{
DECLARE_WAITQUEUE(wait, current);
unsigned long f = *flags;
@@ -785,7 +785,7 @@ void sdp_conn_internal_lock(struct sdp_o
/*
* sdp_conn_relock - test the connection (use only from macro)
*/
-void sdp_conn_relock(struct sdp_opt *conn)
+void sdp_conn_relock(struct sdp_sock *conn)
{
unsigned long flags;
struct ib_wc entry;
@@ -849,7 +849,7 @@ void sdp_conn_relock(struct sdp_opt *con
/*
* sdp_conn_cq_drain - drain one of the the connection's CQs
*/
-int sdp_conn_cq_drain(struct ib_cq *cq, struct sdp_opt *conn)
+int sdp_conn_cq_drain(struct ib_cq *cq, struct sdp_sock *conn)
{
struct ib_wc entry;
int result;
@@ -901,7 +901,7 @@ return calls;
/*
* sdp_conn_internal_unlock - lock the connection (use only from macro)
*/
-void sdp_conn_internal_unlock(struct sdp_opt *conn)
+void sdp_conn_internal_unlock(struct sdp_sock *conn)
{
int calls = 0;
/*
@@ -921,7 +921,7 @@ void sdp_conn_internal_unlock(struct sdp
/*
* sdp_conn_lock_init - initialize connection lock
*/
-static void sdp_conn_lock_init(struct sdp_opt *conn)
+static void sdp_conn_lock_init(struct sdp_sock *conn)
{
spin_lock_init(&(conn->lock.slock));
conn->lock.users = 0;
@@ -931,7 +931,7 @@ static void sdp_conn_lock_init(struct sd
/*
* sdp_conn_alloc_ib - allocate IB structures for a new connection.
*/
-int sdp_conn_alloc_ib(struct sdp_opt *conn, struct ib_device *device,
+int sdp_conn_alloc_ib(struct sdp_sock *conn, struct ib_device *device,
u8 hw_port, u16 pkey)
{
struct ib_qp_init_attr *init_attr;
@@ -1104,15 +1104,15 @@ error_attr:
static struct proto sdp_sk_proto = {
.name = "SDP",
.owner = THIS_MODULE,
- .obj_size = sizeof(struct sdp_opt),
+ .obj_size = sizeof(struct sdp_sock),
};
/*
* sdp_conn_alloc - allocate a new socket, and init.
*/
-struct sdp_opt *sdp_conn_alloc(int priority)
+struct sdp_sock *sdp_conn_alloc(int priority)
{
- struct sdp_opt *conn;
+ struct sdp_sock *conn;
struct sock *sk;
int result;
@@ -1309,7 +1309,7 @@ error:
int sdp_proc_dump_conn_main(char *buffer, int max_size, off_t start_index,
long *end_index)
{
- struct sdp_opt *conn;
+ struct sdp_sock *conn;
off_t counter = 0;
int offset = 0;
u64 s_guid;
@@ -1414,7 +1414,7 @@ int sdp_proc_dump_conn_data(char *buffer
long *end_index)
{
struct sock *sk;
- struct sdp_opt *conn;
+ struct sdp_sock *conn;
off_t counter = 0;
int offset = 0;
unsigned long flags;
@@ -1508,7 +1508,7 @@ done:
int sdp_proc_dump_conn_rdma(char *buffer, int max_size, off_t start_index,
long *end_index)
{
- struct sdp_opt *conn;
+ struct sdp_sock *conn;
off_t counter = 0;
int offset = 0;
unsigned long flags;
@@ -1585,7 +1585,7 @@ done:
int sdp_proc_dump_conn_sopt(char *buffer, int max_size, off_t start_index,
long *end_index)
{
- struct sdp_opt *conn;
+ struct sdp_sock *conn;
off_t counter = 0;
int offset = 0;
unsigned long flags;
@@ -1904,7 +1904,7 @@ int sdp_conn_table_init(int proto_family
goto error_size;
}
- byte_size = conn_size * sizeof(struct sdp_opt *);
+ byte_size = conn_size * sizeof(struct sdp_sock *);
page_size = (byte_size >> 12) + ((0xfff & byte_size) > 0 ? 1 : 0);
for (dev_root_s.sk_ordr = 0;
(1 << dev_root_s.sk_ordr) < page_size; dev_root_s.sk_ordr++) ;
@@ -1985,7 +1985,7 @@ int sdp_conn_table_clear(void)
{
sdp_dbg_init("Deleting connection tables.");
#if 0
- struct sdp_opt *conn;
+ struct sdp_sock *conn;
/*
* drain all the connections
*/
Only in linux-2.6.12-rc3-openib/drivers/infiniband/ulp/sdp.pre/: .sdp_conn.c.swp
diff -up linux-2.6.12-rc3-openib/drivers/infiniband/ulp/sdp.pre/sdp_conn.h linux-2.6.12-rc3-openib/drivers/infiniband/ulp/sdp/sdp_conn.h
--- linux-2.6.12-rc3-openib/drivers/infiniband/ulp/sdp.pre/sdp_conn.h 2005-04-26 11:02:20.765001000 -0700
+++ linux-2.6.12-rc3-openib/drivers/infiniband/ulp/sdp/sdp_conn.h 2005-04-26 21:28:40.331963000 -0700
@@ -146,12 +146,12 @@ enum sdp_mode {
*/
#define SDP_MSG_EVENT_TABLE_SIZE 0x20
-static inline struct sdp_opt *sdp_sk(struct sock *sk)
+static inline struct sdp_sock *sdp_sk(struct sock *sk)
{
- return (struct sdp_opt *)sk;
+ return (struct sdp_sock *)sk;
}
-static inline struct sock *sk_sdp(struct sdp_opt *conn)
+static inline struct sock *sk_sdp(struct sdp_sock *conn)
{
return (struct sock *)conn;
}
@@ -215,7 +215,7 @@ struct sdp_conn_lock {
/*
* SDP Connection structure.
*/
-struct sdp_opt {
+struct sdp_sock {
/*
* inet_sock must be first member of sdp_sock
* NOTE: this depends on inet_sock having struct sock as its
@@ -378,17 +378,17 @@ struct sdp_opt {
/*
* table managment
*/
- struct sdp_opt *lstn_next; /* next conn in the chain */
- struct sdp_opt **lstn_p_next; /* previous next conn in the chain */
+ struct sdp_sock *lstn_next; /* next conn in the chain */
+ struct sdp_sock **lstn_p_next; /* previous next conn in the chain */
- struct sdp_opt *bind_next; /* next conn in the chain */
- struct sdp_opt **bind_p_next; /* previous next conn in the chain */
+ struct sdp_sock *bind_next; /* next conn in the chain */
+ struct sdp_sock **bind_p_next; /* previous next conn in the chain */
/*
* listen/accept managment
*/
- struct sdp_opt *parent; /* listening socket queuing. */
- struct sdp_opt *accept_next; /* sockets waiting for acceptance. */
- struct sdp_opt *accept_prev; /* sockets waiting for acceptance. */
+ struct sdp_sock *parent; /* listening socket queuing. */
+ struct sdp_sock *accept_next; /* sockets waiting for acceptance. */
+ struct sdp_sock *accept_prev; /* sockets waiting for acceptance. */
/*
* OS info
*/
@@ -469,18 +469,18 @@ struct sdp_opt {
/*
* SDP connection lock
*/
-extern void sdp_conn_internal_lock(struct sdp_opt *conn, unsigned long *flags);
-extern void sdp_conn_internal_unlock(struct sdp_opt *conn);
-extern void sdp_conn_relock(struct sdp_opt *conn);
-extern void sdp_conn_destruct(struct sdp_opt *conn);
-extern int sdp_conn_cq_drain(struct ib_cq *cq, struct sdp_opt *conn);
+extern void sdp_conn_internal_lock(struct sdp_sock *conn, unsigned long *flags);
+extern void sdp_conn_internal_unlock(struct sdp_sock *conn);
+extern void sdp_conn_relock(struct sdp_sock *conn);
+extern void sdp_conn_destruct(struct sdp_sock *conn);
+extern int sdp_conn_cq_drain(struct ib_cq *cq, struct sdp_sock *conn);
#define SDP_CONN_LOCK_IRQ(conn, flags) \
spin_lock_irqsave(&((conn)->lock.slock), flags)
#define SDP_CONN_UNLOCK_IRQ(conn, flags) \
spin_unlock_irqrestore(&((conn)->lock.slock), flags)
-static inline void sdp_conn_lock(struct sdp_opt *conn)
+static inline void sdp_conn_lock(struct sdp_sock *conn)
{
unsigned long flags;
@@ -496,7 +496,7 @@ static inline void sdp_conn_lock(struct
spin_unlock_irqrestore(&(conn->lock.slock), flags);
}
-static inline void sdp_conn_unlock(struct sdp_opt *conn)
+static inline void sdp_conn_unlock(struct sdp_sock *conn)
{
unsigned long flags;
@@ -516,12 +516,12 @@ static inline void sdp_conn_unlock(struc
/*
* connection reference counting.
*/
-static inline void sdp_conn_hold(struct sdp_opt *conn)
+static inline void sdp_conn_hold(struct sdp_sock *conn)
{
atomic_inc(&conn->refcnt);
}
-static inline void sdp_conn_put(struct sdp_opt *conn)
+static inline void sdp_conn_put(struct sdp_sock *conn)
{
if (atomic_dec_and_test(&conn->refcnt))
sdp_conn_destruct(conn);
@@ -530,7 +530,7 @@ static inline void sdp_conn_put(struct s
/*
* sdp_conn_error - get the connections error value destructively
*/
-static inline int sdp_conn_error(struct sdp_opt *conn)
+static inline int sdp_conn_error(struct sdp_sock *conn)
{
/*
* The connection error parameter is set and read under the connection
diff -up linux-2.6.12-rc3-openib/drivers/infiniband/ulp/sdp.pre/sdp_dev.h linux-2.6.12-rc3-openib/drivers/infiniband/ulp/sdp/sdp_dev.h
--- linux-2.6.12-rc3-openib/drivers/infiniband/ulp/sdp.pre/sdp_dev.h 2005-04-25 11:55:01.370005000 -0700
+++ linux-2.6.12-rc3-openib/drivers/infiniband/ulp/sdp/sdp_dev.h 2005-04-26 21:28:40.335964000 -0700
@@ -181,12 +181,12 @@ struct sdev_root {
u32 sk_ordr; /* order size of region. */
u32 sk_rover; /* next potential available space. */
u32 sk_entry; /* number of socket table entries. */
- struct sdp_opt **sk_array; /* array of sockets. */
+ struct sdp_sock **sk_array; /* array of sockets. */
/*
* connection managment
*/
- struct sdp_opt *listen_list; /* list of listening connections */
- struct sdp_opt *bind_list; /* connections bound to a port. */
+ struct sdp_sock *listen_list; /* list of listening connections */
+ struct sdp_sock *bind_list; /* connections bound to a port. */
/*
* list locks
*/
diff -up linux-2.6.12-rc3-openib/drivers/infiniband/ulp/sdp.pre/sdp_event.c linux-2.6.12-rc3-openib/drivers/infiniband/ulp/sdp/sdp_event.c
--- linux-2.6.12-rc3-openib/drivers/infiniband/ulp/sdp.pre/sdp_event.c 2005-04-25 11:55:01.374000000 -0700
+++ linux-2.6.12-rc3-openib/drivers/infiniband/ulp/sdp/sdp_event.c 2005-04-26 21:28:40.340967000 -0700
@@ -41,7 +41,7 @@
/*
* sdp_cq_event_locked - main per QP event handler
*/
-int sdp_cq_event_locked(struct ib_wc *comp, struct sdp_opt *conn)
+int sdp_cq_event_locked(struct ib_wc *comp, struct sdp_sock *conn)
{
int result = 0;
@@ -131,7 +131,7 @@ done:
void sdp_cq_event_handler(struct ib_cq *cq, void *arg)
{
s32 hashent = (unsigned long)arg;
- struct sdp_opt *conn;
+ struct sdp_sock *conn;
s32 result;
unsigned long flags;
@@ -199,7 +199,7 @@ done:
*/
static int sdp_cm_idle(struct ib_cm_id *cm_id, struct ib_cm_event *event,
- struct sdp_opt *conn)
+ struct sdp_sock *conn)
{
sdp_dbg_ctrl(conn, "CM IDLE. commID <%08x> event <%d> status <%d>",
cm_id->local_id, event->event, event->param.send_status);
@@ -243,7 +243,7 @@ static int sdp_cm_idle(struct ib_cm_id *
static int sdp_cm_established(struct ib_cm_id *cm_id,
struct ib_cm_event *event,
- struct sdp_opt *conn)
+ struct sdp_sock *conn)
{
int result = 0;
@@ -309,7 +309,7 @@ done:
}
static int sdp_cm_dreq_rcvd(struct ib_cm_id *cm_id, struct ib_cm_event *event,
- struct sdp_opt *conn)
+ struct sdp_sock *conn)
{
int result = 0;
@@ -334,7 +334,7 @@ static int sdp_cm_dreq_rcvd(struct ib_cm
* sdp_cm_timewait - handler for connection Time Wait completion
*/
static int sdp_cm_timewait(struct ib_cm_id *cm_id, struct ib_cm_event *event,
- struct sdp_opt *conn)
+ struct sdp_sock *conn)
{
int result = 0;
@@ -414,7 +414,7 @@ error:
int sdp_cm_event_handler(struct ib_cm_id *cm_id, struct ib_cm_event *event)
{
s32 hashent = (unsigned long)cm_id->context;
- struct sdp_opt *conn = NULL;
+ struct sdp_sock *conn = NULL;
int result = 0;
sdp_dbg_ctrl(NULL, "CM state <%d> event <%d> commID <%08x> ID <%d>",
diff -up linux-2.6.12-rc3-openib/drivers/infiniband/ulp/sdp.pre/sdp_inet.c linux-2.6.12-rc3-openib/drivers/infiniband/ulp/sdp/sdp_inet.c
--- linux-2.6.12-rc3-openib/drivers/infiniband/ulp/sdp.pre/sdp_inet.c 2005-04-25 21:20:07.829965000 -0700
+++ linux-2.6.12-rc3-openib/drivers/infiniband/ulp/sdp/sdp_inet.c 2005-04-26 21:28:40.348962000 -0700
@@ -101,7 +101,7 @@ module_param(sdp_debug_level, int, 0);
*/
void sdp_inet_wake_send(struct sock *sk)
{
- struct sdp_opt *conn = sdp_sk(sk);
+ struct sdp_sock *conn = sdp_sk(sk);
if (sk == NULL)
return;
@@ -187,7 +187,7 @@ void sdp_inet_wake_urg(struct sock *sk)
/*
* sdp_inet_abort - abort an existing connection
*/
-static int sdp_inet_abort(struct sdp_opt *conn)
+static int sdp_inet_abort(struct sdp_sock *conn)
{
int result;
@@ -234,7 +234,7 @@ static int sdp_inet_abort(struct sdp_opt
/*
* sdp_inet_disconnect - disconnect a connection
*/
-static int sdp_inet_disconnect(struct sdp_opt *conn)
+static int sdp_inet_disconnect(struct sdp_sock *conn)
{
int result = 0;
@@ -299,7 +299,7 @@ static int sdp_inet_disconnect(struct sd
*/
static int sdp_inet_release(struct socket *sock)
{
- struct sdp_opt *conn;
+ struct sdp_sock *conn;
struct sock *sk;
int result;
long timeout;
@@ -441,7 +441,7 @@ static int sdp_inet_bind(struct socket *
{
struct sockaddr_in *addr = (struct sockaddr_in *)uaddr;
struct sock *sk;
- struct sdp_opt *conn;
+ struct sdp_sock *conn;
unsigned int addr_result = RTN_UNSPEC;
u16 bind_port;
int result;
@@ -533,7 +533,7 @@ static int sdp_inet_connect(struct socke
{
struct sockaddr_in *addr = (struct sockaddr_in *)uaddr;
struct sock *sk;
- struct sdp_opt *conn;
+ struct sdp_sock *conn;
long timeout;
int result;
@@ -696,7 +696,7 @@ done:
static int sdp_inet_listen(struct socket *sock, int backlog)
{
struct sock *sk;
- struct sdp_opt *conn;
+ struct sdp_sock *conn;
int result;
sk = sock->sk;
@@ -755,8 +755,8 @@ static int sdp_inet_accept(struct socket
{
struct sock *listen_sk;
struct sock *accept_sk = NULL;
- struct sdp_opt *listen_conn;
- struct sdp_opt *accept_conn = NULL;
+ struct sdp_sock *listen_conn;
+ struct sdp_sock *accept_conn = NULL;
int result;
long timeout;
@@ -911,7 +911,7 @@ static int sdp_inet_getname(struct socke
{
struct sockaddr_in *addr = (struct sockaddr_in *)uaddr;
struct sock *sk;
- struct sdp_opt *conn;
+ struct sdp_sock *conn;
sk = sock->sk;
conn = sdp_sk(sk);
@@ -946,7 +946,7 @@ static unsigned int sdp_inet_poll(struct
poll_table *wait)
{
struct sock *sk;
- struct sdp_opt *conn;
+ struct sdp_sock *conn;
unsigned int mask = 0;
/*
@@ -1035,7 +1035,7 @@ static int sdp_inet_ioctl(struct socket
unsigned long arg)
{
struct sock *sk;
- struct sdp_opt *conn;
+ struct sdp_sock *conn;
struct sdpc_buff *buff;
int result = 0;
int value;
@@ -1158,7 +1158,7 @@ static int sdp_inet_setopt(struct socket
char __user *optval, int optlen)
{
struct sock *sk;
- struct sdp_opt *conn;
+ struct sdp_sock *conn;
int value;
int result = 0;
@@ -1225,7 +1225,7 @@ static int sdp_inet_getopt(struct socket
char __user *optval, int __user *optlen)
{
struct sock *sk;
- struct sdp_opt *conn;
+ struct sdp_sock *conn;
int value;
int len;
@@ -1286,7 +1286,7 @@ static int sdp_inet_getopt(struct socket
static int sdp_inet_shutdown(struct socket *sock, int flag)
{
int result = 0;
- struct sdp_opt *conn;
+ struct sdp_sock *conn;
conn = sdp_sk(sock->sk);
@@ -1400,7 +1400,7 @@ static struct proto_ops lnx_stream_ops =
*/
static int sdp_inet_create(struct socket *sock, int protocol)
{
- struct sdp_opt *conn;
+ struct sdp_sock *conn;
sdp_dbg_ctrl(NULL, "SOCKET: type <%d> proto <%d> state <%u:%08lx>",
sock->type, protocol, sock->state, sock->flags);
diff -up linux-2.6.12-rc3-openib/drivers/infiniband/ulp/sdp.pre/sdp_iocb.c linux-2.6.12-rc3-openib/drivers/infiniband/ulp/sdp/sdp_iocb.c
--- linux-2.6.12-rc3-openib/drivers/infiniband/ulp/sdp.pre/sdp_iocb.c 2005-04-25 11:55:01.388002000 -0700
+++ linux-2.6.12-rc3-openib/drivers/infiniband/ulp/sdp/sdp_iocb.c 2005-04-26 21:28:40.353960000 -0700
@@ -420,7 +420,7 @@ static int sdp_mem_lock_cleanup(void)
/*
* sdp_iocb_register - register an IOCBs memory for advertisment
*/
-int sdp_iocb_register(struct sdpc_iocb *iocb, struct sdp_opt *conn)
+int sdp_iocb_register(struct sdpc_iocb *iocb, struct sdp_sock *conn)
{
int result;
diff -up linux-2.6.12-rc3-openib/drivers/infiniband/ulp/sdp.pre/sdp_pass.c linux-2.6.12-rc3-openib/drivers/infiniband/ulp/sdp/sdp_pass.c
--- linux-2.6.12-rc3-openib/drivers/infiniband/ulp/sdp.pre/sdp_pass.c 2005-04-25 21:05:20.526002000 -0700
+++ linux-2.6.12-rc3-openib/drivers/infiniband/ulp/sdp/sdp_pass.c 2005-04-26 21:28:40.359963000 -0700
@@ -37,7 +37,7 @@
/*
* handle incomming passive connection error. (REJ)
*/
-void sdp_cm_pass_error(struct sdp_opt *conn, int error)
+void sdp_cm_pass_error(struct sdp_sock *conn, int error)
{
int result;
struct sock *sk;
@@ -71,7 +71,7 @@ void sdp_cm_pass_error(struct sdp_opt *c
/*
* handle incomming passive connection establishment. (RTU)
*/
-int sdp_cm_pass_establish(struct sdp_opt *conn)
+int sdp_cm_pass_establish(struct sdp_sock *conn)
{
struct ib_qp_attr *qp_attr;
int attr_mask = 0;
@@ -147,7 +147,7 @@ done:
/*
* Functions to handle incoming passive connection requests. (REQ)
*/
-static int sdp_cm_accept(struct sdp_opt *conn)
+static int sdp_cm_accept(struct sdp_sock *conn)
{
struct ib_cm_rep_param param;
struct sdp_msg_hello_ack *hello_ack;
@@ -290,9 +290,9 @@ error:
return result;
}
-static int sdp_cm_listen_lookup(struct sdp_opt *conn)
+static int sdp_cm_listen_lookup(struct sdp_sock *conn)
{
- struct sdp_opt *listen_conn;
+ struct sdp_sock *listen_conn;
struct sock *listen_sk;
struct sock *sk;
int result;
@@ -478,7 +478,7 @@ static int sdp_cm_hello_check(struct sdp
int sdp_cm_req_handler(struct ib_cm_id *cm_id, struct ib_cm_event *event)
{
struct sdp_msg_hello *msg_hello = event->private_data;
- struct sdp_opt *conn;
+ struct sdp_sock *conn;
int result;
sdp_dbg_ctrl(NULL,
diff -up linux-2.6.12-rc3-openib/drivers/infiniband/ulp/sdp.pre/sdp_proto.h linux-2.6.12-rc3-openib/drivers/infiniband/ulp/sdp/sdp_proto.h
--- linux-2.6.12-rc3-openib/drivers/infiniband/ulp/sdp.pre/sdp_proto.h 2005-04-25 21:18:11.542976000 -0700
+++ linux-2.6.12-rc3-openib/drivers/infiniband/ulp/sdp/sdp_proto.h 2005-04-26 21:28:40.366962000 -0700
@@ -114,23 +114,23 @@ int sdp_proc_dump_buff_pool(char *buffer
/*
* Wall between userspace protocol and SDP protocol proper
*/
-int sdp_wall_send_close(struct sdp_opt *conn);
+int sdp_wall_send_close(struct sdp_sock *conn);
-int sdp_wall_send_closing(struct sdp_opt *conn);
+int sdp_wall_send_closing(struct sdp_sock *conn);
-int sdp_wall_send_abort(struct sdp_opt *conn);
+int sdp_wall_send_abort(struct sdp_sock *conn);
-int sdp_wall_recv_close(struct sdp_opt *conn);
+int sdp_wall_recv_close(struct sdp_sock *conn);
-int sdp_wall_recv_closing(struct sdp_opt *conn);
+int sdp_wall_recv_closing(struct sdp_sock *conn);
-int sdp_wall_recv_abort(struct sdp_opt *conn);
+int sdp_wall_recv_abort(struct sdp_sock *conn);
-void sdp_wall_recv_drop(struct sdp_opt *conn);
+void sdp_wall_recv_drop(struct sdp_sock *conn);
-int sdp_wall_abort(struct sdp_opt *conn);
+int sdp_wall_abort(struct sdp_sock *conn);
-int sdp_recv_buff(struct sdp_opt *conn, struct sdpc_buff *buff);
+int sdp_recv_buff(struct sdp_sock *conn, struct sdpc_buff *buff);
/*
* Zcopy advertisment managment
@@ -184,7 +184,7 @@ void sdp_iocb_q_cancel(struct sdpc_iocb_
void sdp_iocb_q_remove(struct sdpc_iocb *iocb);
-int sdp_iocb_register(struct sdpc_iocb *iocb, struct sdp_opt *conn);
+int sdp_iocb_register(struct sdpc_iocb *iocb, struct sdp_sock *conn);
int sdp_iocb_release(struct sdpc_iocb *iocb);
@@ -276,13 +276,13 @@ int sdp_proc_dump_device(char *buffer,
off_t start_index,
long *end_index);
-int sdp_conn_table_remove(struct sdp_opt *conn);
+int sdp_conn_table_remove(struct sdp_sock *conn);
-struct sdp_opt *sdp_conn_table_lookup(s32 entry);
+struct sdp_sock *sdp_conn_table_lookup(s32 entry);
-struct sdp_opt *sdp_conn_alloc(int priority);
+struct sdp_sock *sdp_conn_alloc(int priority);
-int sdp_conn_alloc_ib(struct sdp_opt *conn,
+int sdp_conn_alloc_ib(struct sdp_sock *conn,
struct ib_device *device,
u8 hw_port,
u16 pkey);
@@ -300,41 +300,41 @@ void sdp_inet_wake_urg(struct sock *sk);
/*
* port/queue managment
*/
-int sdp_inet_accept_q_put(struct sdp_opt *listen_conn,
- struct sdp_opt *accept_conn);
+int sdp_inet_accept_q_put(struct sdp_sock *listen_conn,
+ struct sdp_sock *accept_conn);
-struct sdp_opt *sdp_inet_accept_q_get(struct sdp_opt *listen_conn);
+struct sdp_sock *sdp_inet_accept_q_get(struct sdp_sock *listen_conn);
-int sdp_inet_accept_q_remove(struct sdp_opt *accept_conn);
+int sdp_inet_accept_q_remove(struct sdp_sock *accept_conn);
-int sdp_inet_listen_start(struct sdp_opt *listen_conn);
+int sdp_inet_listen_start(struct sdp_sock *listen_conn);
-int sdp_inet_listen_stop(struct sdp_opt *listen_conn);
+int sdp_inet_listen_stop(struct sdp_sock *listen_conn);
-struct sdp_opt *sdp_inet_listen_lookup(u32 addr, u16 port);
+struct sdp_sock *sdp_inet_listen_lookup(u32 addr, u16 port);
-int sdp_inet_port_get(struct sdp_opt *conn, u16 port);
+int sdp_inet_port_get(struct sdp_sock *conn, u16 port);
-int sdp_inet_port_put(struct sdp_opt *conn);
+int sdp_inet_port_put(struct sdp_sock *conn);
-int sdp_inet_port_inherit(struct sdp_opt *parent, struct sdp_opt *child);
+int sdp_inet_port_inherit(struct sdp_sock *parent, struct sdp_sock *child);
/*
* active connect functions
*/
-int sdp_cm_connect(struct sdp_opt *conn);
+int sdp_cm_connect(struct sdp_sock *conn);
int sdp_cm_rep_handler(struct ib_cm_id *cm_id,
struct ib_cm_event *event,
- struct sdp_opt *conn);
+ struct sdp_sock *conn);
-void sdp_cm_actv_error(struct sdp_opt *conn, int error);
+void sdp_cm_actv_error(struct sdp_sock *conn, int error);
/*
* passive connect functions
*/
-void sdp_cm_pass_error(struct sdp_opt *conn, int error);
+void sdp_cm_pass_error(struct sdp_sock *conn, int error);
-int sdp_cm_pass_establish(struct sdp_opt *conn);
+int sdp_cm_pass_establish(struct sdp_sock *conn);
int sdp_cm_req_handler(struct ib_cm_id *cm_id,
struct ib_cm_event *event);
@@ -342,36 +342,36 @@ int sdp_cm_req_handler(struct ib_cm_id *
/*
* post functions
*/
-int sdp_recv_flush(struct sdp_opt *conn);
+int sdp_recv_flush(struct sdp_sock *conn);
-int sdp_send_flush(struct sdp_opt *conn);
+int sdp_send_flush(struct sdp_sock *conn);
-int sdp_send_ctrl_ack(struct sdp_opt *conn);
+int sdp_send_ctrl_ack(struct sdp_sock *conn);
-int sdp_send_ctrl_disconnect(struct sdp_opt *conn);
+int sdp_send_ctrl_disconnect(struct sdp_sock *conn);
-int sdp_send_ctrl_abort(struct sdp_opt *conn);
+int sdp_send_ctrl_abort(struct sdp_sock *conn);
-int sdp_send_ctrl_send_sm(struct sdp_opt *conn);
+int sdp_send_ctrl_send_sm(struct sdp_sock *conn);
-int sdp_send_ctrl_snk_avail(struct sdp_opt *conn,
+int sdp_send_ctrl_snk_avail(struct sdp_sock *conn,
u32 size,
u32 rkey,
u64 addr);
-int sdp_send_ctrl_resize_buff_ack(struct sdp_opt *conn, u32 size);
+int sdp_send_ctrl_resize_buff_ack(struct sdp_sock *conn, u32 size);
-int sdp_send_ctrl_rdma_rd(struct sdp_opt *conn, s32 size);
+int sdp_send_ctrl_rdma_rd(struct sdp_sock *conn, s32 size);
-int sdp_send_ctrl_rdma_wr(struct sdp_opt *conn, u32 size);
+int sdp_send_ctrl_rdma_wr(struct sdp_sock *conn, u32 size);
-int sdp_send_ctrl_mode_ch(struct sdp_opt *conn, u8 mode);
+int sdp_send_ctrl_mode_ch(struct sdp_sock *conn, u8 mode);
-int sdp_send_ctrl_src_cancel(struct sdp_opt *conn);
+int sdp_send_ctrl_src_cancel(struct sdp_sock *conn);
-int sdp_send_ctrl_snk_cancel(struct sdp_opt *conn);
+int sdp_send_ctrl_snk_cancel(struct sdp_sock *conn);
-int sdp_send_ctrl_snk_cancel_ack(struct sdp_opt *conn);
+int sdp_send_ctrl_snk_cancel_ack(struct sdp_sock *conn);
/*
* inet functions
@@ -380,20 +380,20 @@ int sdp_send_ctrl_snk_cancel_ack(struct
/*
* event functions
*/
-int sdp_cq_event_locked(struct ib_wc *comp, struct sdp_opt *conn);
+int sdp_cq_event_locked(struct ib_wc *comp, struct sdp_sock *conn);
void sdp_cq_event_handler(struct ib_cq *cq, void *arg);
int sdp_cm_event_handler(struct ib_cm_id *cm_id,
struct ib_cm_event *event);
-int sdp_event_recv(struct sdp_opt *conn, struct ib_wc *comp);
+int sdp_event_recv(struct sdp_sock *conn, struct ib_wc *comp);
-int sdp_event_send(struct sdp_opt *conn, struct ib_wc *comp);
+int sdp_event_send(struct sdp_sock *conn, struct ib_wc *comp);
-int sdp_event_read(struct sdp_opt *conn, struct ib_wc *comp);
+int sdp_event_read(struct sdp_sock *conn, struct ib_wc *comp);
-int sdp_event_write(struct sdp_opt *conn, struct ib_wc *comp);
+int sdp_event_write(struct sdp_sock *conn, struct ib_wc *comp);
/*
* DATA transport
@@ -409,11 +409,11 @@ int sdp_inet_recv(struct kiocb *iocb,
size_t size,
int flags);
-void sdp_iocb_q_cancel_all_read(struct sdp_opt *conn, ssize_t error);
+void sdp_iocb_q_cancel_all_read(struct sdp_sock *conn, ssize_t error);
-void sdp_iocb_q_cancel_all_write(struct sdp_opt *conn, ssize_t error);
+void sdp_iocb_q_cancel_all_write(struct sdp_sock *conn, ssize_t error);
-void sdp_iocb_q_cancel_all(struct sdp_opt *conn, ssize_t error);
+void sdp_iocb_q_cancel_all(struct sdp_sock *conn, ssize_t error);
/*
* link address information
@@ -443,7 +443,7 @@ int sdp_link_addr_cleanup(void);
/*
* Event handling function, demultiplexed base on Message ID
*/
-typedef int (*sdp_event_cb_func)(struct sdp_opt *conn,
+typedef int (*sdp_event_cb_func)(struct sdp_sock *conn,
struct sdpc_buff *buff);
/*
@@ -478,7 +478,7 @@ extern int sdp_debug_level;
#define sdp_conn_dbg(level, type, conn, format, arg...) \
do { \
- struct sdp_opt *x = (conn); \
+ struct sdp_sock *x = (conn); \
if (x) { \
sdp_dbg_out(level, type, \
"<%d> <%04x:%04x> " format, \
@@ -552,7 +552,7 @@ do {
/*
* sdp_inet_write_space - writable space on send side
*/
-static inline int sdp_inet_write_space(struct sdp_opt *conn, int urg)
+static inline int sdp_inet_write_space(struct sdp_sock *conn, int urg)
{
int size;
@@ -576,7 +576,7 @@ static inline int sdp_inet_write_space(s
/*
* sdp_inet_writable - return non-zero if socket is writable
*/
-static inline int sdp_inet_writable(struct sdp_opt *conn)
+static inline int sdp_inet_writable(struct sdp_sock *conn)
{
if (SDP_ST_MASK_OPEN & conn->istate)
return (sdp_inet_write_space(conn, 0) <
@@ -588,7 +588,7 @@ static inline int sdp_inet_writable(stru
/*
* sdp_conn_stat_dump - dump stats to the log
*/
-static inline int sdp_conn_stat_dump(struct sdp_opt *conn)
+static inline int sdp_conn_stat_dump(struct sdp_sock *conn)
{
#ifdef _SDP_CONN_STATS_REC
int counter;
@@ -611,7 +611,7 @@ static inline int sdp_conn_stat_dump(str
/*
* sdp_conn_state_dump - dump state information to the log
*/
-static inline void sdp_conn_state_dump(struct sdp_opt *conn)
+static inline void sdp_conn_state_dump(struct sdp_sock *conn)
{
#ifdef _SDP_CONN_STATE_REC
int counter;
diff -up linux-2.6.12-rc3-openib/drivers/infiniband/ulp/sdp.pre/sdp_rcvd.c linux-2.6.12-rc3-openib/drivers/infiniband/ulp/sdp/sdp_rcvd.c
--- linux-2.6.12-rc3-openib/drivers/infiniband/ulp/sdp.pre/sdp_rcvd.c 2005-04-25 11:55:01.474000000 -0700
+++ linux-2.6.12-rc3-openib/drivers/infiniband/ulp/sdp/sdp_rcvd.c 2005-04-26 21:28:40.377962000 -0700
@@ -38,7 +38,7 @@
* Specific MID handler functions. (RECV)
*/
-static int sdp_rcvd_disconnect(struct sdp_opt *conn, struct sdpc_buff *buff)
+static int sdp_rcvd_disconnect(struct sdp_sock *conn, struct sdpc_buff *buff)
{
int result = 0;
@@ -115,7 +115,7 @@ error:
return result;
}
-static int sdp_rcvd_abort(struct sdp_opt *conn, struct sdpc_buff *buff)
+static int sdp_rcvd_abort(struct sdp_sock *conn, struct sdpc_buff *buff)
{
int result = 0;
@@ -145,7 +145,7 @@ static int sdp_rcvd_abort(struct sdp_opt
return result;
}
-static int sdp_rcvd_send_sm(struct sdp_opt *conn, struct sdpc_buff *buff)
+static int sdp_rcvd_send_sm(struct sdp_sock *conn, struct sdpc_buff *buff)
{
struct sdpc_iocb *iocb;
int result;
@@ -188,7 +188,7 @@ static int sdp_rcvd_send_sm(struct sdp_o
return 0;
}
-static int sdp_rcvd_rdma_wr(struct sdp_opt *conn, struct sdpc_buff *buff)
+static int sdp_rcvd_rdma_wr(struct sdp_sock *conn, struct sdpc_buff *buff)
{
struct msg_hdr_rwch *rwch;
struct sdpc_iocb *iocb;
@@ -249,7 +249,7 @@ error:
return result;
}
-static int sdp_rcvd_rdma_rd(struct sdp_opt *conn, struct sdpc_buff *buff)
+static int sdp_rcvd_rdma_rd(struct sdp_sock *conn, struct sdpc_buff *buff)
{
struct msg_hdr_rrch *rrch;
struct sdpc_iocb *iocb;
@@ -331,7 +331,7 @@ error:
return result;
}
-static int sdp_rcvd_mode_change(struct sdp_opt *conn, struct sdpc_buff *buff)
+static int sdp_rcvd_mode_change(struct sdp_sock *conn, struct sdpc_buff *buff)
{
struct msg_hdr_mch *mch;
int result;
@@ -427,7 +427,7 @@ error:
return result;
}
-static int sdp_rcvd_src_cancel(struct sdp_opt *conn, struct sdpc_buff *buff)
+static int sdp_rcvd_src_cancel(struct sdp_sock *conn, struct sdpc_buff *buff)
{
struct sdpc_advt *advt;
int result;
@@ -517,7 +517,7 @@ done:
return result;
}
-static int sdp_rcvd_snk_cancel(struct sdp_opt *conn, struct sdpc_buff *buff)
+static int sdp_rcvd_snk_cancel(struct sdp_sock *conn, struct sdpc_buff *buff)
{
struct sdpc_advt *advt;
s32 counter;
@@ -591,7 +591,7 @@ done:
/*
* sdp_rcvd_snk_cancel_ack - sink cancel confirmantion
*/
-static int sdp_rcvd_snk_cancel_ack(struct sdp_opt *conn, struct sdpc_buff *buff)
+static int sdp_rcvd_snk_cancel_ack(struct sdp_sock *conn, struct sdpc_buff *buff)
{
struct sdpc_iocb *iocb;
int result;
@@ -629,7 +629,7 @@ done:
/*
* sdp_rcvd_resize_buff_ack - buffer size change request
*/
-static int sdp_rcvd_resize_buff_ack(struct sdp_opt *conn,
+static int sdp_rcvd_resize_buff_ack(struct sdp_sock *conn,
struct sdpc_buff *buff)
{
struct msg_hdr_crbh *crbh;
@@ -659,7 +659,7 @@ error:
return result;
}
-static int sdp_rcvd_suspend(struct sdp_opt *conn, struct sdpc_buff *buff)
+static int sdp_rcvd_suspend(struct sdp_sock *conn, struct sdpc_buff *buff)
{
struct msg_hdr_sch *sch;
@@ -671,12 +671,12 @@ static int sdp_rcvd_suspend(struct sdp_o
return 0;
}
-static int sdp_rcvd_suspend_ack(struct sdp_opt *conn, struct sdpc_buff *buff)
+static int sdp_rcvd_suspend_ack(struct sdp_sock *conn, struct sdpc_buff *buff)
{
return 0;
}
-static int sdp_rcvd_snk_avail(struct sdp_opt *conn, struct sdpc_buff *buff)
+static int sdp_rcvd_snk_avail(struct sdp_sock *conn, struct sdpc_buff *buff)
{
struct msg_hdr_snkah *snkah;
struct sdpc_advt *advt;
@@ -810,7 +810,7 @@ error:
return result;
}
-static int sdp_rcvd_src_avail(struct sdp_opt *conn, struct sdpc_buff *buff)
+static int sdp_rcvd_src_avail(struct sdp_sock *conn, struct sdpc_buff *buff)
{
struct msg_hdr_srcah *srcah;
struct sdpc_advt *advt;
@@ -980,7 +980,7 @@ done:
/*
* sdp_rcvd_data - SDP data message event received
*/
-static int sdp_rcvd_data(struct sdp_opt *conn, struct sdpc_buff *buff)
+static int sdp_rcvd_data(struct sdp_sock *conn, struct sdpc_buff *buff)
{
int ret_val;
@@ -1025,7 +1025,7 @@ static int sdp_rcvd_data(struct sdp_opt
/*
* sdp_rcvd_unsupported - Valid messages we're not expecting
*/
-static int sdp_rcvd_unsupported(struct sdp_opt *conn, struct sdpc_buff *buff)
+static int sdp_rcvd_unsupported(struct sdp_sock *conn, struct sdpc_buff *buff)
{
/*
* Since the gateway only initates RDMA's but is never a target, and
@@ -1089,7 +1089,7 @@ static sdp_event_cb_func recv_event_func
/*
* sdp_event_recv - recv event demultiplexing into sdp messages
*/
-int sdp_event_recv(struct sdp_opt *conn, struct ib_wc *comp)
+int sdp_event_recv(struct sdp_sock *conn, struct ib_wc *comp)
{
sdp_event_cb_func dispatch_func;
struct sdpc_buff *buff;
diff -up linux-2.6.12-rc3-openib/drivers/infiniband/ulp/sdp.pre/sdp_read.c linux-2.6.12-rc3-openib/drivers/infiniband/ulp/sdp/sdp_read.c
--- linux-2.6.12-rc3-openib/drivers/infiniband/ulp/sdp.pre/sdp_read.c 2005-04-25 11:55:01.478002000 -0700
+++ linux-2.6.12-rc3-openib/drivers/infiniband/ulp/sdp/sdp_read.c 2005-04-26 21:28:40.383962000 -0700
@@ -41,7 +41,7 @@
/*
* sdp_event_read_advt - RDMA read event handler for source advertisments
*/
-static int sdp_event_read_advt(struct sdp_opt *conn, struct ib_wc *comp)
+static int sdp_event_read_advt(struct sdp_sock *conn, struct ib_wc *comp)
{
struct sdpc_advt *advt;
int result;
@@ -107,7 +107,7 @@ error:
/*
* sdp_event_read - RDMA read event handler
*/
-int sdp_event_read(struct sdp_opt *conn, struct ib_wc *comp)
+int sdp_event_read(struct sdp_sock *conn, struct ib_wc *comp)
{
struct sdpc_iocb *iocb;
struct sdpc_buff *buff;
diff -up linux-2.6.12-rc3-openib/drivers/infiniband/ulp/sdp.pre/sdp_recv.c linux-2.6.12-rc3-openib/drivers/infiniband/ulp/sdp/sdp_recv.c
--- linux-2.6.12-rc3-openib/drivers/infiniband/ulp/sdp.pre/sdp_recv.c 2005-04-25 11:55:01.489003000 -0700
+++ linux-2.6.12-rc3-openib/drivers/infiniband/ulp/sdp/sdp_recv.c 2005-04-26 21:28:40.391966000 -0700
@@ -41,7 +41,7 @@
/*
* sdp_post_recv_buff - post a single buffers for data recv
*/
-static int sdp_post_recv_buff(struct sdp_opt *conn)
+static int sdp_post_recv_buff(struct sdp_sock *conn)
{
struct ib_recv_wr receive_param = { NULL };
struct ib_recv_wr *bad_wr;
@@ -115,7 +115,7 @@ error:
/*
* sdp_post_rdma_buff - post a single buffers for rdma read on a conn
*/
-static int sdp_post_rdma_buff(struct sdp_opt *conn)
+static int sdp_post_rdma_buff(struct sdp_sock *conn)
{
struct ib_send_wr send_param = { NULL };
struct ib_send_wr *bad_wr;
@@ -222,7 +222,7 @@ done:
/*
* sdp_post_rdma_iocb_src - post a iocb for rdma read on a conn
*/
-static int sdp_post_rdma_iocb_src(struct sdp_opt *conn)
+static int sdp_post_rdma_iocb_src(struct sdp_sock *conn)
{
struct ib_send_wr send_param = { NULL };
struct ib_send_wr *bad_wr;
@@ -353,7 +353,7 @@ done:
/*
* sdp_post_rdma_iocb_snk - post a iocb for rdma read on a conn
*/
-static int sdp_post_rdma_iocb_snk(struct sdp_opt *conn)
+static int sdp_post_rdma_iocb_snk(struct sdp_sock *conn)
{
struct sdpc_iocb *iocb;
int result = 0;
@@ -452,7 +452,7 @@ error:
/*
* sdp_post_rdma - post a rdma based requests for a connection
*/
-static int sdp_post_rdma(struct sdp_opt *conn)
+static int sdp_post_rdma(struct sdp_sock *conn)
{
int result = 0;
@@ -531,7 +531,7 @@ done:
/*
* sdp_recv_flush - post a certain number of buffers on a connection
*/
-int sdp_recv_flush(struct sdp_opt *conn)
+int sdp_recv_flush(struct sdp_sock *conn)
{
int result = 0;
int counter;
@@ -695,7 +695,7 @@ static int sdp_read_buff_iocb(struct sdp
/*
* sdp_recv_buff_iocb_active - Ease AIO read pending pressure
*/
-static int sdp_recv_buff_iocb_active(struct sdp_opt *conn,
+static int sdp_recv_buff_iocb_active(struct sdp_sock *conn,
struct sdpc_buff *buff)
{
struct sdpc_iocb *iocb;
@@ -744,7 +744,7 @@ static int sdp_recv_buff_iocb_active(str
/*
* sdp_recv_buff_iocb_pending - Ease AIO read pending pressure
*/
-static int sdp_recv_buff_iocb_pending(struct sdp_opt *conn,
+static int sdp_recv_buff_iocb_pending(struct sdp_sock *conn,
struct sdpc_buff *buff)
{
struct sdpc_iocb *iocb;
@@ -804,7 +804,7 @@ static int sdp_recv_buff_iocb_pending(st
/*
* sdp_recv_buff - Process a new buffer based on queue type
*/
-int sdp_recv_buff(struct sdp_opt *conn, struct sdpc_buff *buff)
+int sdp_recv_buff(struct sdp_sock *conn, struct sdpc_buff *buff)
{
int result;
int buffered;
@@ -917,7 +917,7 @@ static int sdp_read_src_lookup(struct sd
static int sdp_inet_read_cancel(struct kiocb *req, struct io_event *ev)
{
struct sock_iocb *si = kiocb_to_siocb(req);
- struct sdp_opt *conn;
+ struct sdp_sock *conn;
struct sdpc_iocb *iocb;
int result = 0;
@@ -1081,7 +1081,7 @@ static int sdp_inet_recv_urg_trav(struct
static int sdp_inet_recv_urg(struct sock *sk, struct msghdr *msg, int size,
int flags)
{
- struct sdp_opt *conn;
+ struct sdp_sock *conn;
struct sdpc_buff *buff;
int result = 0;
u8 value;
@@ -1155,7 +1155,7 @@ int sdp_inet_recv(struct kiocb *req, st
size_t size, int flags)
{
struct sock *sk;
- struct sdp_opt *conn;
+ struct sdp_sock *conn;
struct sdpc_iocb *iocb;
struct sdpc_buff *buff;
struct sdpc_buff *head = NULL;
diff -up linux-2.6.12-rc3-openib/drivers/infiniband/ulp/sdp.pre/sdp_send.c linux-2.6.12-rc3-openib/drivers/infiniband/ulp/sdp/sdp_send.c
--- linux-2.6.12-rc3-openib/drivers/infiniband/ulp/sdp.pre/sdp_send.c 2005-04-25 11:55:01.511001000 -0700
+++ linux-2.6.12-rc3-openib/drivers/infiniband/ulp/sdp/sdp_send.c 2005-04-26 21:28:40.403961000 -0700
@@ -41,7 +41,7 @@
/*
* sdp_send_buff_post - Post a buffer send on a SDP connection
*/
-static int sdp_send_buff_post(struct sdp_opt *conn, struct sdpc_buff *buff)
+static int sdp_send_buff_post(struct sdp_sock *conn, struct sdpc_buff *buff)
{
struct ib_send_wr send_param = { NULL };
struct ib_send_wr *bad_wr;
@@ -182,7 +182,7 @@ done:
/*
* sdp_send_data_buff_post - Post data for buffered transmission
*/
-static int sdp_send_data_buff_post(struct sdp_opt *conn, struct sdpc_buff *buff)
+static int sdp_send_data_buff_post(struct sdp_sock *conn, struct sdpc_buff *buff)
{
struct sdpc_advt *advt;
int result;
@@ -292,7 +292,7 @@ error:
/*
* sdp_send_data_buff_snk - Post data for buffered transmission
*/
-static int sdp_send_data_buff_snk(struct sdp_opt *conn, struct sdpc_buff *buff)
+static int sdp_send_data_buff_snk(struct sdp_sock *conn, struct sdpc_buff *buff)
{
struct ib_send_wr send_param = { NULL };
struct ib_send_wr *bad_wr;
@@ -428,7 +428,7 @@ error:
/*
* sdp_send_data_iocb_snk - process a zcopy write advert in the data path
*/
-static int sdp_send_data_iocb_snk(struct sdp_opt *conn, struct sdpc_iocb *iocb)
+static int sdp_send_data_iocb_snk(struct sdp_sock *conn, struct sdpc_iocb *iocb)
{
struct ib_send_wr send_param = { NULL };
struct ib_send_wr *bad_wr;
@@ -553,7 +553,7 @@ error:
/*
* sdp_send_data_iocb_src - send a zcopy read advert in the data path
*/
-static int sdp_send_data_iocb_src(struct sdp_opt *conn, struct sdpc_iocb *iocb)
+static int sdp_send_data_iocb_src(struct sdp_sock *conn, struct sdpc_iocb *iocb)
{
struct msg_hdr_srcah *src_ah;
struct sdpc_buff *buff;
@@ -764,7 +764,7 @@ static int sdp_send_iocb_buff_write(stru
/*
* sdp_send_data_iocb_buff - write multiple SDP buffers from an iocb
*/
-static int sdp_send_data_iocb_buff(struct sdp_opt *conn, struct sdpc_iocb *iocb)
+static int sdp_send_data_iocb_buff(struct sdp_sock *conn, struct sdpc_iocb *iocb)
{
struct sdpc_buff *buff;
int result;
@@ -837,7 +837,7 @@ error:
/*
* sdp_send_data_iocb - Post IOCB data for transmission
*/
-static int sdp_send_data_iocb(struct sdp_opt *conn, struct sdpc_iocb *iocb)
+static int sdp_send_data_iocb(struct sdp_sock *conn, struct sdpc_iocb *iocb)
{
int result = ENOBUFS;
@@ -928,7 +928,7 @@ done:
/*
* sdp_send_data_queue_test - send data buffer if conditions are met
*/
-static int sdp_send_data_queue_test(struct sdp_opt *conn,
+static int sdp_send_data_queue_test(struct sdp_sock *conn,
struct sdpc_desc *element)
{
int result;
@@ -959,7 +959,7 @@ static int sdp_send_data_queue_test(stru
/*
* sdp_send_data_queue_flush - Flush data from send queue, to send post
*/
-static int sdp_send_data_queue_flush(struct sdp_opt *conn)
+static int sdp_send_data_queue_flush(struct sdp_sock *conn)
{
struct sdpc_desc *element;
int result = 0;
@@ -1001,7 +1001,7 @@ static int sdp_send_data_queue_flush(str
/*
* sdp_send_data_queue - send using the data queue if necessary
*/
-static int sdp_send_data_queue(struct sdp_opt *conn, struct sdpc_desc *element)
+static int sdp_send_data_queue(struct sdp_sock *conn, struct sdpc_desc *element)
{
int result = 0;
@@ -1050,7 +1050,7 @@ done:
/*
* sdp_send_data_buff_get - get an appropriate write buffer for send
*/
-static inline struct sdpc_buff *sdp_send_data_buff_get(struct sdp_opt *conn)
+static inline struct sdpc_buff *sdp_send_data_buff_get(struct sdp_sock *conn)
{
struct sdpc_buff *buff;
@@ -1075,7 +1075,7 @@ static inline struct sdpc_buff *sdp_send
/*
* sdp_send_data_buff_put - place a buffer into the send queue
*/
-static inline int sdp_send_data_buff_put(struct sdp_opt *conn,
+static inline int sdp_send_data_buff_put(struct sdp_sock *conn,
struct sdpc_buff *buff, int size,
int urg)
{
@@ -1132,7 +1132,7 @@ static inline int sdp_send_data_buff_put
/*
* sdp_send_ctrl_buff_test - determine if it's OK to post a control msg
*/
-static int sdp_send_ctrl_buff_test(struct sdp_opt *conn, struct sdpc_buff *buff)
+static int sdp_send_ctrl_buff_test(struct sdp_sock *conn, struct sdpc_buff *buff)
{
int result = 0;
@@ -1158,7 +1158,7 @@ error:
/*
* sdp_send_ctrl_buff_flush - Flush control buffers, to send post
*/
-static int sdp_send_ctrl_buff_flush(struct sdp_opt *conn)
+static int sdp_send_ctrl_buff_flush(struct sdp_sock *conn)
{
struct sdpc_desc *element;
int result = 0;
@@ -1195,7 +1195,7 @@ static int sdp_send_ctrl_buff_flush(stru
/*
* sdp_send_ctrl_buff_buffered - Send a buffered control message
*/
-static int sdp_send_ctrl_buff_buffered(struct sdp_opt *conn,
+static int sdp_send_ctrl_buff_buffered(struct sdp_sock *conn,
struct sdpc_buff *buff)
{
int result = 0;
@@ -1231,7 +1231,7 @@ error:
/*
* sdp_send_ctrl_buff - Create and Send a buffered control message
*/
-static int sdp_send_ctrl_buff(struct sdp_opt *conn, u8 mid, int se, int sig)
+static int sdp_send_ctrl_buff(struct sdp_sock *conn, u8 mid, int se, int sig)
{
int result = 0;
struct sdpc_buff *buff;
@@ -1285,7 +1285,7 @@ error:
/*
* do_send_ctrl_disconnect - Send a disconnect request
*/
-static int do_send_ctrl_disconnect(struct sdp_opt *conn)
+static int do_send_ctrl_disconnect(struct sdp_sock *conn)
{
int result = 0;
struct sdpc_buff *buff;
@@ -1334,7 +1334,7 @@ error:
/*
* sdp_send_ctrl_disconnect - potentially send a disconnect request
*/
-int sdp_send_ctrl_disconnect(struct sdp_opt *conn)
+int sdp_send_ctrl_disconnect(struct sdp_sock *conn)
{
int result;
@@ -1365,7 +1365,7 @@ int sdp_send_ctrl_disconnect(struct sdp_
/*
* sdp_send_ctrl_ack - Send a gratuitous Ack
*/
-int sdp_send_ctrl_ack(struct sdp_opt *conn)
+int sdp_send_ctrl_ack(struct sdp_sock *conn)
{
/*
* The gratuitous ack is not really and ack, but an update of the
@@ -1387,7 +1387,7 @@ int sdp_send_ctrl_ack(struct sdp_opt *co
/*
* sdp_send_ctrl_send_sm - Send a request for buffered mode
*/
-int sdp_send_ctrl_send_sm(struct sdp_opt *conn)
+int sdp_send_ctrl_send_sm(struct sdp_sock *conn)
{
return sdp_send_ctrl_buff(conn, SDP_MID_SEND_SM, 1, 1);
}
@@ -1395,7 +1395,7 @@ int sdp_send_ctrl_send_sm(struct sdp_opt
/*
* sdp_send_ctrl_src_cancel - Send a source cancel
*/
-int sdp_send_ctrl_src_cancel(struct sdp_opt *conn)
+int sdp_send_ctrl_src_cancel(struct sdp_sock *conn)
{
return sdp_send_ctrl_buff(conn, SDP_MID_SRC_CANCEL, 1, 1);
}
@@ -1403,7 +1403,7 @@ int sdp_send_ctrl_src_cancel(struct sdp_
/*
* sdp_send_ctrl_snk_cancel - Send a sink cancel
*/
-int sdp_send_ctrl_snk_cancel(struct sdp_opt *conn)
+int sdp_send_ctrl_snk_cancel(struct sdp_sock *conn)
{
return sdp_send_ctrl_buff(conn, SDP_MID_SNK_CANCEL, 1, 1);
}
@@ -1411,7 +1411,7 @@ int sdp_send_ctrl_snk_cancel(struct sdp_
/*
* sdp_send_ctrl_snk_cancel_ack - Send an ack for a sink cancel
*/
-int sdp_send_ctrl_snk_cancel_ack(struct sdp_opt *conn)
+int sdp_send_ctrl_snk_cancel_ack(struct sdp_sock *conn)
{
return sdp_send_ctrl_buff(conn, SDP_MID_SNK_CANCEL_ACK, 1, 1);
}
@@ -1419,7 +1419,7 @@ int sdp_send_ctrl_snk_cancel_ack(struct
/*
* sdp_send_ctrl_abort - Send an abort message
*/
-int sdp_send_ctrl_abort(struct sdp_opt *conn)
+int sdp_send_ctrl_abort(struct sdp_sock *conn)
{
/*
* send
@@ -1430,7 +1430,7 @@ int sdp_send_ctrl_abort(struct sdp_opt *
/*
* sdp_send_ctrl_resize_buff_ack - Send an ack for a buffer size change
*/
-int sdp_send_ctrl_resize_buff_ack(struct sdp_opt *conn, u32 size)
+int sdp_send_ctrl_resize_buff_ack(struct sdp_sock *conn, u32 size)
{
struct msg_hdr_crbah *crbah;
struct sdpc_buff *buff;
@@ -1481,7 +1481,7 @@ error:
/*
* sdp_send_ctrl_rdma_rd - Send an rdma read completion
*/
-int sdp_send_ctrl_rdma_rd(struct sdp_opt *conn, s32 size)
+int sdp_send_ctrl_rdma_rd(struct sdp_sock *conn, s32 size)
{
struct msg_hdr_rrch *rrch;
struct sdpc_buff *buff;
@@ -1550,7 +1550,7 @@ error:
/*
* sdp_send_ctrl_rdma_wr - Send an rdma write completion
*/
-int sdp_send_ctrl_rdma_wr(struct sdp_opt *conn, u32 size)
+int sdp_send_ctrl_rdma_wr(struct sdp_sock *conn, u32 size)
{
struct msg_hdr_rwch *rwch;
struct sdpc_buff *buff;
@@ -1607,7 +1607,7 @@ error:
/*
* sdp_send_ctrl_snk_avail - Send a sink available message
*/
-int sdp_send_ctrl_snk_avail(struct sdp_opt *conn, u32 size, u32 rkey, u64 addr)
+int sdp_send_ctrl_snk_avail(struct sdp_sock *conn, u32 size, u32 rkey, u64 addr)
{
struct msg_hdr_snkah *snkah;
struct sdpc_buff *buff;
@@ -1670,7 +1670,7 @@ error:
/*
* sdp_send_ctrl_mode_ch - Send a mode change command
*/
-int sdp_send_ctrl_mode_ch(struct sdp_opt *conn, u8 mode)
+int sdp_send_ctrl_mode_ch(struct sdp_sock *conn, u8 mode)
{
struct msg_hdr_mch *mch;
struct sdpc_buff *buff;
@@ -1776,7 +1776,7 @@ static int sdp_write_src_lookup(struct s
static int sdp_inet_write_cancel(struct kiocb *req, struct io_event *ev)
{
struct sock_iocb *si = kiocb_to_siocb(req);
- struct sdp_opt *conn;
+ struct sdp_sock *conn;
struct sdpc_iocb *iocb;
int result = 0;
@@ -1915,7 +1915,7 @@ done:
/*
* sdp_send_flush_advt - Flush passive sink advertisments
*/
-static int sdp_send_flush_advt(struct sdp_opt *conn)
+static int sdp_send_flush_advt(struct sdp_sock *conn)
{
struct sdpc_advt *advt;
int result;
@@ -1954,7 +1954,7 @@ static int sdp_send_flush_advt(struct sd
/*
* sdp_send_flush - Flush buffers from send queue, in to send post
*/
-int sdp_send_flush(struct sdp_opt *conn)
+int sdp_send_flush(struct sdp_sock *conn)
{
int result = 0;
@@ -2016,7 +2016,7 @@ int sdp_inet_send(struct kiocb *req, str
size_t size)
{
struct sock *sk;
- struct sdp_opt *conn;
+ struct sdp_sock *conn;
struct sdpc_buff *buff;
struct sdpc_iocb *iocb;
int result = 0;
diff -up linux-2.6.12-rc3-openib/drivers/infiniband/ulp/sdp.pre/sdp_sent.c linux-2.6.12-rc3-openib/drivers/infiniband/ulp/sdp/sdp_sent.c
--- linux-2.6.12-rc3-openib/drivers/infiniband/ulp/sdp.pre/sdp_sent.c 2005-04-25 11:55:01.516002000 -0700
+++ linux-2.6.12-rc3-openib/drivers/infiniband/ulp/sdp/sdp_sent.c 2005-04-26 21:28:40.409964000 -0700
@@ -38,7 +38,7 @@
* Specific MID handler functions. (SEND)
*/
-static int sdp_sent_disconnect(struct sdp_opt *conn, struct sdpc_buff *buff)
+static int sdp_sent_disconnect(struct sdp_sock *conn, struct sdpc_buff *buff)
{
int result;
@@ -116,7 +116,7 @@ error:
return result;
}
-static int sdp_sent_abort(struct sdp_opt *conn, struct sdpc_buff *buff)
+static int sdp_sent_abort(struct sdp_sock *conn, struct sdpc_buff *buff)
{
int result;
@@ -134,12 +134,12 @@ static int sdp_sent_abort(struct sdp_opt
return result;
}
-static int sdp_sent_send_sm(struct sdp_opt *conn, struct sdpc_buff *buff)
+static int sdp_sent_send_sm(struct sdp_sock *conn, struct sdpc_buff *buff)
{
return 0;
}
-static int sdp_sent_rdma_wr(struct sdp_opt *conn, struct sdpc_buff *buff)
+static int sdp_sent_rdma_wr(struct sdp_sock *conn, struct sdpc_buff *buff)
{
struct msg_hdr_rwch *rwch;
@@ -151,7 +151,7 @@ static int sdp_sent_rdma_wr(struct sdp_o
return 0;
}
-static int sdp_sent_rdma_rd(struct sdp_opt *conn, struct sdpc_buff *buff)
+static int sdp_sent_rdma_rd(struct sdp_sock *conn, struct sdpc_buff *buff)
{
struct msg_hdr_rrch *rrch;
@@ -163,7 +163,7 @@ static int sdp_sent_rdma_rd(struct sdp_o
return 0;
}
-static int sdp_sent_mode_change(struct sdp_opt *conn, struct sdpc_buff *buff)
+static int sdp_sent_mode_change(struct sdp_sock *conn, struct sdpc_buff *buff)
{
struct msg_hdr_mch *mch;
@@ -175,22 +175,22 @@ static int sdp_sent_mode_change(struct s
return 0;
}
-static int sdp_sent_src_cancel(struct sdp_opt *conn, struct sdpc_buff *buff)
+static int sdp_sent_src_cancel(struct sdp_sock *conn, struct sdpc_buff *buff)
{
return 0;
}
-static int sdp_sent_snk_cancel(struct sdp_opt *conn, struct sdpc_buff *buff)
+static int sdp_sent_snk_cancel(struct sdp_sock *conn, struct sdpc_buff *buff)
{
return 0;
}
-static int sdp_sent_snk_cancel_ack(struct sdp_opt *conn, struct sdpc_buff *buff)
+static int sdp_sent_snk_cancel_ack(struct sdp_sock *conn, struct sdpc_buff *buff)
{
return 0;
}
-static int sdp_sent_resize_buff_ack(struct sdp_opt *conn,
+static int sdp_sent_resize_buff_ack(struct sdp_sock *conn,
struct sdpc_buff *buff)
{
struct msg_hdr_crbah *crbah;
@@ -203,7 +203,7 @@ static int sdp_sent_resize_buff_ack(stru
return 0;
}
-static int sdp_sent_suspend(struct sdp_opt *conn, struct sdpc_buff *buff)
+static int sdp_sent_suspend(struct sdp_sock *conn, struct sdpc_buff *buff)
{
struct msg_hdr_sch *sch;
@@ -215,12 +215,12 @@ static int sdp_sent_suspend(struct sdp_o
return 0;
}
-static int sdp_sent_suspend_ack(struct sdp_opt *conn, struct sdpc_buff *buff)
+static int sdp_sent_suspend_ack(struct sdp_sock *conn, struct sdpc_buff *buff)
{
return 0;
}
-static int sdp_sent_snk_avail(struct sdp_opt *conn, struct sdpc_buff *buff)
+static int sdp_sent_snk_avail(struct sdp_sock *conn, struct sdpc_buff *buff)
{
struct msg_hdr_snkah *snkah;
@@ -232,7 +232,7 @@ static int sdp_sent_snk_avail(struct sdp
return 0;
}
-static int sdp_sent_src_avail(struct sdp_opt *conn, struct sdpc_buff *buff)
+static int sdp_sent_src_avail(struct sdp_sock *conn, struct sdpc_buff *buff)
{
struct msg_hdr_srcah *srcah;
@@ -247,7 +247,7 @@ static int sdp_sent_src_avail(struct sdp
/*
* sdp_sent_data - SDP data message event received
*/
-static int sdp_sent_data(struct sdp_opt *conn, struct sdpc_buff *buff)
+static int sdp_sent_data(struct sdp_sock *conn, struct sdpc_buff *buff)
{
int result = 0;
@@ -259,7 +259,7 @@ static int sdp_sent_data(struct sdp_opt
/*
* sdp_sent_unsupported - Valid messages we're not sending
*/
-static int sdp_sent_unsupported(struct sdp_opt *conn, struct sdpc_buff *buff)
+static int sdp_sent_unsupported(struct sdp_sock *conn, struct sdpc_buff *buff)
{
/*
* Since the gateway only initates RDMA's but is never a target, and
@@ -321,7 +321,7 @@ static sdp_event_cb_func send_event_func
/*
* sdp_event_send - send event handler
*/
-int sdp_event_send(struct sdp_opt *conn, struct ib_wc *comp)
+int sdp_event_send(struct sdp_sock *conn, struct ib_wc *comp)
{
sdp_event_cb_func dispatch_func;
u32 free_count = 0;
diff -up linux-2.6.12-rc3-openib/drivers/infiniband/ulp/sdp.pre/sdp_wall.c linux-2.6.12-rc3-openib/drivers/infiniband/ulp/sdp/sdp_wall.c
--- linux-2.6.12-rc3-openib/drivers/infiniband/ulp/sdp.pre/sdp_wall.c 2005-04-25 11:55:01.525001000 -0700
+++ linux-2.6.12-rc3-openib/drivers/infiniband/ulp/sdp/sdp_wall.c 2005-04-26 21:28:40.416962000 -0700
@@ -41,7 +41,7 @@
/*
* sdp_wall_send_close - callback to accept an active close
*/
-int sdp_wall_send_close(struct sdp_opt *conn)
+int sdp_wall_send_close(struct sdp_sock *conn)
{
int result;
@@ -108,7 +108,7 @@ error:
/*
* sdp_wall_send_closing - callback to confirm a passive close
*/
-int sdp_wall_send_closing(struct sdp_opt *conn)
+int sdp_wall_send_closing(struct sdp_sock *conn)
{
int result;
@@ -158,7 +158,7 @@ error:
/*
* sdp_wall_send_abort - callback to accept an active abort
*/
-int sdp_wall_send_abort(struct sdp_opt *conn)
+int sdp_wall_send_abort(struct sdp_sock *conn)
{
int result = 0;
@@ -265,7 +265,7 @@ error:
/*
* sdp_wall_recv_close - callback to accept an active close
*/
-int sdp_wall_recv_close(struct sdp_opt *conn)
+int sdp_wall_recv_close(struct sdp_sock *conn)
{
sdp_dbg_ctrl(conn, "Close recv. src <%08x:%04x> dst <%08x:%04x>",
conn->src_addr, conn->src_port,
@@ -306,7 +306,7 @@ int sdp_wall_recv_close(struct sdp_opt *
/*
* sdp_wall_recv_closing - callback for a close confirmation
*/
-int sdp_wall_recv_closing(struct sdp_opt *conn)
+int sdp_wall_recv_closing(struct sdp_sock *conn)
{
sdp_dbg_ctrl(conn, "Closing recv. src <%08x:%04x> dst <%08x:%04x>",
conn->src_addr, conn->src_port,
@@ -336,7 +336,7 @@ int sdp_wall_recv_closing(struct sdp_opt
/*
* sdp_wall_recv_abort - abortive close notification
*/
-int sdp_wall_recv_abort(struct sdp_opt *conn)
+int sdp_wall_recv_abort(struct sdp_sock *conn)
{
sdp_dbg_ctrl(conn, "Abort recv. src <%08x:%04x> dst <%08x:%04x>",
conn->src_addr, conn->src_port,
@@ -376,7 +376,7 @@ int sdp_wall_recv_abort(struct sdp_opt *
/*
* sdp_wall_recv_drop - drop SDP protocol reference to socket
*/
-void sdp_wall_recv_drop(struct sdp_opt *conn)
+void sdp_wall_recv_drop(struct sdp_sock *conn)
{
int result;
@@ -433,7 +433,7 @@ void sdp_wall_recv_drop(struct sdp_opt *
/*
* sdp_wall_abort - intiate socket dropping
*/
-int sdp_wall_abort(struct sdp_opt *conn)
+int sdp_wall_abort(struct sdp_sock *conn)
{
int result;
diff -up linux-2.6.12-rc3-openib/drivers/infiniband/ulp/sdp.pre/sdp_write.c linux-2.6.12-rc3-openib/drivers/infiniband/ulp/sdp/sdp_write.c
--- linux-2.6.12-rc3-openib/drivers/infiniband/ulp/sdp.pre/sdp_write.c 2005-04-25 11:55:01.528004000 -0700
+++ linux-2.6.12-rc3-openib/drivers/infiniband/ulp/sdp/sdp_write.c 2005-04-26 21:28:40.419965000 -0700
@@ -41,7 +41,7 @@
/*
* sdp_event_write - RDMA write event handler
*/
-int sdp_event_write(struct sdp_opt *conn, struct ib_wc *comp)
+int sdp_event_write(struct sdp_sock *conn, struct ib_wc *comp)
{
struct sdpc_iocb *iocb;
struct sdpc_buff *buff;
More information about the general
mailing list