diff --git a/fcst/ft_cmd.c b/fcst/ft_cmd.c index 0cf8b52db..aeb9241d8 100644 --- a/fcst/ft_cmd.c +++ b/fcst/ft_cmd.c @@ -598,7 +598,9 @@ static void ft_recv_tm(struct scst_session *scst_sess, scst_rx_mgmt_params_init(¶ms); -#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 4, 0) +#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 4, 0) || \ + defined(CONFIG_SUSE_KERNEL) && \ + LINUX_VERSION_CODE >= KERNEL_VERSION(3, 0, 101) params.lun = fcp->fc_lun.scsi_lun; #else params.lun = fcp->fc_lun; @@ -684,7 +686,9 @@ static void ft_recv_cmd(struct ft_sess *sess, struct fc_frame *fp) cdb_len += sizeof(fcp->fc_cdb); data_len = ntohl(*(__be32 *)(fcp->fc_cdb + cdb_len)); -#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 4, 0) +#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 4, 0) || \ + defined(CONFIG_SUSE_KERNEL) && \ + LINUX_VERSION_CODE >= KERNEL_VERSION(3, 0, 101) cmd = scst_rx_cmd(sess->scst_sess, fcp->fc_lun.scsi_lun, sizeof(fcp->fc_lun), fcp->fc_cdb, cdb_len, SCST_ATOMIC); diff --git a/fcst/ft_sess.c b/fcst/ft_sess.c index c696b6435..01d8607a9 100644 --- a/fcst/ft_sess.c +++ b/fcst/ft_sess.c @@ -178,7 +178,8 @@ static u32 ft_sess_hash(u32 port_id) ! (LINUX_VERSION_CODE >> 8 == KERNEL_VERSION(3, 4, 0) >> 8 && \ LINUX_VERSION_CODE >= KERNEL_VERSION(3, 4, 41)) && \ ! (LINUX_VERSION_CODE >> 8 == KERNEL_VERSION(3, 2, 0) >> 8 && \ - LINUX_VERSION_CODE >= KERNEL_VERSION(3, 2, 44)) + LINUX_VERSION_CODE >= KERNEL_VERSION(3, 2, 44)) && \ + !defined(CONFIG_SUSE_KERNEL) /* * See also commit 4b20db3 (kref: Implement kref_get_unless_zero v3 -- v3.8). * See also commit e3a5505 in branch stable/linux-3.4.y (v3.4.41).