mirrors/scst
1
0
Fork 0
mirror of https://github.com/SCST-project/scst.git synced 2026-05-17 18:51:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'svn-trunk'

Browse Source
This commit is contained in:
Bart Van Assche
2019-07-14 14:30:48 -07:00
parent ae95f456e2 780b839247
commit 460002536c
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
qla2x00t-32gbit/qla_nvme.c
View File

@@ -9,11 +9,11 @@
#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 10, 0)
#include "qla_nvme.h"
#include <linux/scatterlist.h>
#include <linux/delay.h>
#include <linux/nvme.h>
#include <linux/nvme-fc.h>
#include "qla_nvme.h"
static struct nvme_fc_port_template qla_nvme_fc_transport;
@@ -558,7 +558,6 @@ static void qla_nvme_remoteport_delete(struct nvme_fc_remote_port *rport)
fcport = qla_rport->fcport;
fcport->nvme_remote_port = NULL;
fcport->nvme_flag &= ~NVME_FLAG_REGISTERED;
list_for_each_entry_safe(qla_rport, trport,
&fcport->vha->nvme_rport_list, list) {
if (qla_rport->fcport == fcport) {

1
qla2x00t-32gbit/qla_nvme.h
View File

@@ -10,6 +10,7 @@
#include <scsi/fc/fc_fs.h>
#include <scsi/fc/fc_els.h>
#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 10, 0)
#include <linux/scatterlist.h>
#include <linux/nvme-fc-driver.h>
#endif