Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c6494153 authored by Sagi Grimberg's avatar Sagi Grimberg Committed by Doug Ledford
Browse files

IB/isert: Remove unused file iser_proto.h 



We don't need iser_proto.h anymore, remove it and
move (non-protocol) declarations to ib_isert.h

Signed-off-by: default avatarSagi Grimberg <sagig@mellanox.com>
Signed-off-by: default avatarJenny Derzhavetz <jennyf@mellanox.com>
Reviewed-by: default avatarChristoph Hellwig <hch@lst.de>
Signed-off-by: default avatarDoug Ledford <dledford@redhat.com>
parent d3cf81f9

drivers/infiniband/ulp/isert/ib_isert.c

+0 −1
Original line number Diff line number Diff line
@@ -29,7 +29,6 @@ 
#include <target/iscsi/iscsi_transport.h>

#include <linux/semaphore.h>



#include "isert_proto.h"

#include "ib_isert.h"



#define	ISERT_MAX_CONN		8

drivers/infiniband/ulp/isert/ib_isert.h

+32 −0
Original line number Diff line number Diff line
@@ -33,6 +33,38 @@ 
#define isert_err(fmt, arg...) \

	pr_err(PFX "%s: " fmt, __func__ , ## arg)



/* Constant PDU lengths calculations */

#define ISER_HEADERS_LEN	(sizeof(struct iser_ctrl) + \

				 sizeof(struct iscsi_hdr))

#define ISER_RECV_DATA_SEG_LEN	8192

#define ISER_RX_PAYLOAD_SIZE	(ISER_HEADERS_LEN + ISER_RECV_DATA_SEG_LEN)

#define ISER_RX_LOGIN_SIZE	(ISER_HEADERS_LEN + ISCSI_DEF_MAX_RECV_SEG_LEN)



/* QP settings */

/* Maximal bounds on received asynchronous PDUs */

#define ISERT_MAX_TX_MISC_PDUS	4 /* NOOP_IN(2) , ASYNC_EVENT(2)   */



#define ISERT_MAX_RX_MISC_PDUS	6 /*

				   * NOOP_OUT(2), TEXT(1),

				   * SCSI_TMFUNC(2), LOGOUT(1)

				   */



#define ISCSI_DEF_XMIT_CMDS_MAX 128 /* from libiscsi.h, must be power of 2 */



#define ISERT_QP_MAX_RECV_DTOS	(ISCSI_DEF_XMIT_CMDS_MAX)



#define ISERT_MIN_POSTED_RX	(ISCSI_DEF_XMIT_CMDS_MAX >> 2)



#define ISERT_INFLIGHT_DATAOUTS	8



#define ISERT_QP_MAX_REQ_DTOS	(ISCSI_DEF_XMIT_CMDS_MAX *    \

				(1 + ISERT_INFLIGHT_DATAOUTS) + \

				ISERT_MAX_TX_MISC_PDUS	+ \

				ISERT_MAX_RX_MISC_PDUS)



#define ISER_RX_PAD_SIZE	(ISER_RECV_DATA_SEG_LEN + 4096 - \

		(ISER_RX_PAYLOAD_SIZE + sizeof(u64) + sizeof(struct ib_sge)))



#define ISCSI_ISER_SG_TABLESIZE		256

#define ISER_FASTREG_LI_WRID		0xffffffffffffffffULL

#define ISER_BEACON_WRID               0xfffffffffffffffeULL

drivers/infiniband/ulp/isert/isert_proto.h

deleted100644 → 0
+0 −31
Original line number Diff line number Diff line 
/* From iscsi_iser.h */



/* Constant PDU lengths calculations */

#define ISER_HEADERS_LEN  (sizeof(struct iser_ctrl) + sizeof(struct iscsi_hdr))



#define ISER_RECV_DATA_SEG_LEN  8192

#define ISER_RX_PAYLOAD_SIZE    (ISER_HEADERS_LEN + ISER_RECV_DATA_SEG_LEN)

#define ISER_RX_LOGIN_SIZE      (ISER_HEADERS_LEN + ISCSI_DEF_MAX_RECV_SEG_LEN)



/* QP settings */

/* Maximal bounds on received asynchronous PDUs */

#define ISERT_MAX_TX_MISC_PDUS	4 /* NOOP_IN(2) , ASYNC_EVENT(2)   */



#define ISERT_MAX_RX_MISC_PDUS	6 /* NOOP_OUT(2), TEXT(1),         *

				   * SCSI_TMFUNC(2), LOGOUT(1) */



#define ISCSI_DEF_XMIT_CMDS_MAX 128 /* from libiscsi.h, must be power of 2 */



#define ISERT_QP_MAX_RECV_DTOS	(ISCSI_DEF_XMIT_CMDS_MAX)



#define ISERT_MIN_POSTED_RX	(ISCSI_DEF_XMIT_CMDS_MAX >> 2)



#define ISERT_INFLIGHT_DATAOUTS	8



#define ISERT_QP_MAX_REQ_DTOS	(ISCSI_DEF_XMIT_CMDS_MAX *    \

				(1 + ISERT_INFLIGHT_DATAOUTS) + \

				ISERT_MAX_TX_MISC_PDUS	+ \

				ISERT_MAX_RX_MISC_PDUS)



#define ISER_RX_PAD_SIZE	(ISER_RECV_DATA_SEG_LEN + 4096 - \

		(ISER_RX_PAYLOAD_SIZE + sizeof(u64) + sizeof(struct ib_sge)))