diff --git a/scripts/generate-kernel-patch b/scripts/generate-kernel-patch
index 19b7589ee..8040f73fc 100755
--- a/scripts/generate-kernel-patch
+++ b/scripts/generate-kernel-patch
@@ -173,8 +173,6 @@ generating_upstream_patch="false"
 mpt_scst="false"
 multiple_patches="false"
 patchdir=""
-qla2x00t="false"
-qla2x00t_32gbit="true"
 replace_sbug_by_bug="true"
 specialize_patch_options=(-v "delete_disabled_code=1")
 srpt="true"
@@ -226,6 +224,16 @@ else
   include_fcst="false"
 fi
 
+# See also commit 89d9a567952b ("[SCSI] add support for per-host cmd pools";
+# v3.15).
+if kernel_version_lt "$kver" 3.15; then
+    qla2x00t="true"
+    qla2x00t_32gbit="false"
+else
+    qla2x00t="false"
+    qla2x00t_32gbit="true"
+fi
+
 if [ -e "scst/kernel/in-tree/Makefile.scst-${kver}" ]; then
   scst_makefile="Makefile.scst-${kver}"
 else
diff --git a/scripts/kernel-functions b/scripts/kernel-functions
index 979b2f20f..1b2ff8cff 100644
--- a/scripts/kernel-functions
+++ b/scripts/kernel-functions
@@ -11,6 +11,10 @@ function kernel_version_le {
     awk -v "v1=$1" -v "v2=$2" 'BEGIN { n1 = split(v1, v1a, "."); n2 = split(v2, v2a, "."); for (i=1;;i++) { e1 = i <= n1 ? v1a[i] : 0; e2 = i <= n2 ? v2a[i] : 0; if (e1 < e2 || i > n1 && i > n2) exit 0; if (e1 > e2) exit 1; }}'
 }
 
+function kernel_version_lt {
+    [ "$1" != "$2" ] && kernel_version_le "$1" "$2"
+}
+
 # Kernel version number.
 function kernel_version {
   if [ "${1#2.}" != "$1" ]; then