Merge branch 'svn-trunk'

This commit is contained in:
Bart Van Assche
2015-10-19 06:51:49 -07:00
2 changed files with 1 additions and 3 deletions

View File

@@ -4090,7 +4090,7 @@ static const struct attribute *srpt_sess_attrs[] = {
/* SCST target template for the SRP target implementation. */
static struct scst_tgt_template srpt_template = {
.name = DRV_NAME,
.sg_tablesize = SRPT_DEF_SG_TABLESIZE,
.sg_tablesize = 1 << 16,
.max_hw_pending_time = RDMA_COMPL_TIMEOUT_S,
#if !defined(CONFIG_SCST_PROC)
.enable_target = srpt_enable_target,

View File

@@ -118,8 +118,6 @@ enum {
SRP_LOGIN_RSP_MULTICHAN_TERMINATED = 0x1,
SRP_LOGIN_RSP_MULTICHAN_MAINTAINED = 0x2,
SRPT_DEF_SG_TABLESIZE = 128,
MIN_SRPT_SQ_SIZE = 16,
DEF_SRPT_SQ_SIZE = 4096,
SRPT_RQ_SIZE = 128,