diff --git a/fcst/fcst.h b/fcst/fcst.h
index 57b972c81..027831dd1 100644
--- a/fcst/fcst.h
+++ b/fcst/fcst.h
@@ -118,7 +118,8 @@ extern struct scst_tgt_template ft_scst_template;
 int ft_prli(struct fc_rport_priv *, u32 spp_len,
 	    const struct fc_els_spp *, struct fc_els_spp *);
 void ft_prlo(struct fc_rport_priv *);
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 36)
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 36) \
+	&& (!defined(RHEL_MAJOR) || RHEL_MAJOR -0 <= 5)
 void ft_recv(struct fc_lport *, struct fc_seq *, struct fc_frame *);
 #else
 void ft_recv(struct fc_lport *, struct fc_frame *);
diff --git a/fcst/ft_sess.c b/fcst/ft_sess.c
index b18cb65fc..49c78b4e7 100644
--- a/fcst/ft_sess.c
+++ b/fcst/ft_sess.c
@@ -490,7 +490,8 @@ void ft_prlo(struct fc_rport_priv *rdata)
  * Caller has verified that the frame is type FCP.
  * Note that this may be called directly from the softirq context.
  */
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 36)
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 36) \
+	&& (!defined(RHEL_MAJOR) || RHEL_MAJOR -0 <= 5)
 void ft_recv(struct fc_lport *lport, struct fc_seq *sp, struct fc_frame *fp)
 #else
 void ft_recv(struct fc_lport *lport, struct fc_frame *fp)
@@ -508,7 +509,8 @@ void ft_recv(struct fc_lport *lport, struct fc_frame *fp)
 	sess = ft_sess_get(lport, sid);
 	if (!sess) {
 		FT_SESS_DBG("sid %x sess lookup failed\n", sid);
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 36)
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 36) \
+	&& (!defined(RHEL_MAJOR) || RHEL_MAJOR -0 <= 5)
 		lport->tt.exch_done(sp);
 #endif
 		/* TBD XXX - if FCP_CMND, send LOGO */