Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Port to Linux kernel v6.3 (Part 2) #138

Merged
merged 1 commit into from
Mar 6, 2023
+18 −6
Merged

Port to Linux kernel v6.3 (Part 2) #138

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion qla2x00t-32gbit/qla_isr.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ qla27xx_process_purex_fpin(struct scsi_qla_host *vha, struct purex_item *item)
ql_dump_buffer(ql_dbg_init + ql_dbg_verbose, vha, 0x508f,
pkt, pkt_size);

fc_host_fpin_rcv(vha->host, pkt_size, (char *)pkt);
fc_host_fpin_rcv(vha->host, pkt_size, (char *)pkt, 0);
}

const char *const port_state_str[] = {
Expand Down
22 changes: 17 additions & 5 deletions scst/include/backport.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1642,17 +1642,29 @@ enum {
#define wwn_to_u64(wwn) get_unaligned_be64(wwn)
#endif

#if LINUX_VERSION_CODE < KERNEL_VERSION(6, 3, 0)
/*
* See also commit c39e0af64bce ("scsi: scsi_transport_fc: Add FPIN fc event
* codes") # v5.2
* See also commit 64fd2ba977b1 ("scsi: scsi_transport_fc: Add an additional
* flag to fc_host_fpin_rcv()") # v6.3
*/
static inline void
fc_host_fpin_rcv_backport(struct Scsi_Host *shost, u32 fpin_len, char *fpin_buf,
u8 event_acknowledge)
{
#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 2, 0) && \
(!defined(RHEL_MAJOR) || RHEL_MAJOR -0 < 8 || \
RHEL_MAJOR -0 == 8 && RHEL_MINOR -0 < 2)
static inline void
fc_host_fpin_rcv(struct Scsi_Host *shost, u32 fpin_len, char *fpin_buf)
{
/*
* See also commit c39e0af64bce ("scsi: scsi_transport_fc: Add FPIN fc event
* codes") # v5.2
*/
return;
#else
return fc_host_fpin_rcv(shost, fpin_len, fpin_buf);
#endif
}

#define fc_host_fpin_rcv fc_host_fpin_rcv_backport
#endif

#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 14, 0)
Expand Down