d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Make ICL_KERNEL_PROXY compilable.

Browse Source 
MFC after:	1 month
Sponsored by:	The FreeBSD Foundation
This commit is contained in:
Edward Tomasz Napierala 2016-05-17 07:56:45 +00:00
parent 857a214d03
commit 47d8fd8502
2 changed files with 14 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
sys/dev/iscsi/icl.h
View File

@ -138,22 +138,6 @@ int icl_unregister(const char *offload);
struct sockaddr;
struct icl_listen;
struct icl_listen_sock {
TAILQ_ENTRY(icl_listen_sock) ils_next;
struct icl_listen *ils_listen;
struct socket *ils_socket;
bool ils_running;
bool ils_disconnecting;
int ils_id;
};
struct icl_listen {
TAILQ_HEAD(, icl_listen_sock) il_sockets;
struct sx il_lock;
void (*il_accept)(struct socket *,
struct sockaddr *, int);
};
/*
* Initiator part.
*/
@ -177,5 +161,4 @@ int icl_listen_remove(struct icl_listen *il, struct sockaddr *sa);
int icl_conn_handoff_sock(struct icl_conn *ic, struct socket *so);
#endif /* ICL_KERNEL_PROXY */
#endif /* !ICL_H */

43
sys/dev/iscsi/icl_proxy.c
View File

@ -84,33 +84,27 @@ __FBSDID("$FreeBSD$");
#include <sys/systm.h>
#include <netinet/in.h>
#include <netinet/tcp.h>
#include <linux/types.h>
#include <rdma/rdma_cm.h>
#include <dev/iscsi/icl.h>
static int debug = 1;
struct icl_listen_sock {
TAILQ_ENTRY(icl_listen_sock) ils_next;
struct icl_listen *ils_listen;
struct socket *ils_socket;
bool ils_running;
bool ils_disconnecting;
int ils_id;
};
#define ICL_DEBUG(X, ...) \
if (debug > 1) { \
printf("%s: " X "\n", __func__, ## __VA_ARGS__);\
} while (0)
#define ICL_WARN(X, ...) \
if (debug > 0) { \
printf("WARNING: %s: " X "\n", \
__func__, ## __VA_ARGS__); \
} while (0)
struct icl_listen {
TAILQ_HEAD(, icl_listen_sock) il_sockets;
struct sx il_lock;
void (*il_accept)(struct socket *,
struct sockaddr *, int);
};
static MALLOC_DEFINE(M_ICL_PROXY, "ICL_PROXY", "iSCSI common layer proxy");
#ifdef ICL_RDMA
static int icl_conn_connect_rdma(struct icl_conn *ic, int domain, int socktype,
int protocol, struct sockaddr *from_sa, struct sockaddr *to_sa);
static int icl_listen_add_rdma(struct icl_listen *il, int domain, int socktype, int protocol,
struct sockaddr *sa);
#endif /* ICL_RDMA */
static int
icl_conn_connect_tcp(struct icl_conn *ic, int domain, int socktype,
int protocol, struct sockaddr *from_sa, struct sockaddr *to_sa)
@ -172,12 +166,8 @@ icl_conn_connect(struct icl_conn *ic, bool rdma, int domain, int socktype,
{
if (rdma) {
#ifdef ICL_RDMA
return (icl_conn_connect_rdma(ic, domain, socktype, protocol, from_sa, to_sa));
#else
ICL_DEBUG("RDMA not supported");
return (EOPNOTSUPP);
#endif
}
return (icl_conn_connect_tcp(ic, domain, socktype, protocol, from_sa, to_sa));
@ -375,13 +365,8 @@ icl_listen_add(struct icl_listen *il, bool rdma, int domain, int socktype,
{
if (rdma) {
#ifndef ICL_RDMA
ICL_DEBUG("RDMA not supported");
return (EOPNOTSUPP);
#else
return (icl_listen_add_rdma(il, domain, socktype, protocol,
sa, portal_id));
#endif
}