From 501793a2bc9555d5706e5703a6760e8770da7051 Mon Sep 17 00:00:00 2001 From: Vladimir Sokolovsky Date: Tue, 18 Mar 2014 18:14:03 +0200 Subject: [PATCH] Added RHEL7.0 support + refreshed backports Signed-off-by: Vladimir Sokolovsky --- ofed_scripts/gen-compat-config.sh | 18 +++++++++ patches/0001-BACKPORT-ib_core.patch | 26 ++++++------- ...T-mlx4-mlx4_core-mlx4_en-and-mlx4_ib.patch | 28 +++++++------- patches/0003-BACKPORT-ib_ipoib.patch | 12 +++--- ...4-Enable-header-file-inclusion-with-.patch | 7 ++-- patches/0005-BACKPORT-ib_srp.patch | 4 +- ...0006-cxgb3-cxgb4-Fix-pr_fmt-warnings.patch | 8 ++-- ...ts-for-RHEL6.4-RHEL6.5-and-SLES11sp3.patch | 18 ++++----- ...ts-for-RHEL6.4-RHEL6.5-and-SLES11sp3.patch | 6 +-- ...ts-for-RHEL6.4-RHEL6.5-and-SLES11sp3.patch | 6 +-- ...ts-for-RHEL6.4-RHEL6.5-and-SLES11sp3.patch | 8 ++-- ...pdate-driver-version-to-reflect-ofed.patch | 4 +- ...pdate-driver-version-to-reflect-ofed.patch | 4 +- ...-qib-backport-qib_fs.c-before-2.6.35.patch | 4 +- ...qib-backport-3.2-for-pinned_vm-field.patch | 4 +- ...path-backport-qib_fs.c-before-2.6.35.patch | 4 +- ...ath-backport-3.2-for-pinned_vm-field.patch | 4 +- .../0017-Deal-with-struct-pci-changes.patch | 4 +- patches/0018-Work-around-new-idr-style.patch | 4 +- .../0019-RDMA-nes-3.12-backport-patches.patch | 10 ++--- ...oid-recompilation-of-the-whole-SCSI-.patch | 4 +- ...ader-file-inclusion-with-absolute-pa.patch | 4 +- ...a-idr_alloc-backport-for-kernels-3.9.patch | 4 +- ...> 0023-nfsrdma-Backport-for-rhel6.5.patch} | 22 ++++++++--- ...ackport-for-40G-support-for-Chelsio.patch} | 12 +++++- ...-for-RHEL-6.4-RHEL-6.5-and-SLES11SP3.patch | 31 +++++++--------- ...0026-nfsrdma-Backport-for-sles11sp3.patch} | 16 ++++++-- ...> 0027-be2net-update-version-string.patch} | 15 +++----- .../0028-mlx4_en-Backport-for-RHEL7.0.patch | 37 +++++++++++++++++++ 29 files changed, 201 insertions(+), 127 deletions(-) rename patches/{0023-nfsrdma-backport-for-RHEL6.5.patch => 0023-nfsrdma-Backport-for-rhel6.5.patch} (88%) rename patches/{0024-cxgb4-Backport-for-40G-support.patch => 0024-cxgb4-Backport-for-40G-support-for-Chelsio.patch} (61%) rename patches/{0025-nfsrdma-backport-for-SLES11sp3.patch => 0026-nfsrdma-Backport-for-sles11sp3.patch} (72%) rename patches/{0026-be2net-update-version-string.patch => 0027-be2net-update-version-string.patch} (69%) create mode 100644 patches/0028-mlx4_en-Backport-for-RHEL7.0.patch diff --git a/ofed_scripts/gen-compat-config.sh b/ofed_scripts/gen-compat-config.sh index c27e148..0c66d22 100755 --- a/ofed_scripts/gen-compat-config.sh +++ b/ofed_scripts/gen-compat-config.sh @@ -27,6 +27,20 @@ function set_config { eval "export $VAR=$VALUE" echo "export $VAR=$VALUE" } +function unset_config { + VAR=$1 + + eval "unset $VAR" + echo "unexport $VAR" +} + +function check_autofconf { + VAR=$1 + VALUE=$(tac ${KLIB_BUILD}/include/*/autoconf.h | grep -m1 ${VAR} | sed -ne 's/.*\([01]\)$/\1/gp') + + eval "export $VAR=$VALUE" +} + # Note that this script will export all variables explicitly, # trying to export all with a blanket "export" statement at # the top of the generated file causes the build to slow down @@ -252,3 +266,7 @@ fi if (grep -q virtqueue_add_buf_gfp ${KLIB_BUILD}/tools/include/virtio/linux/virtio.h > /dev/null 2>&1 || grep -q virtqueue_add_buf_gfp /lib/modules/${KVERSION}/source/include/linux/virtio.h > /dev/null 2>&1); then set_config CONFIG_COMPAT_VIRTQUEUE_ADD_BUF_GFP y fi + +if (grep -qw __IFLA_VF_LINK_STATE_MAX ${KLIB_BUILD}/include/uapi/linux/if_link.h > /dev/null 2>&1 || grep -qw __IFLA_VF_LINK_STATE_MAX /lib/modules/${KVERSION}/source/include/uapi/linux/if_link.h > /dev/null 2>&1); then + set_config CONFIG_COMPAT_IFLA_VF_LINK_STATE_MAX y +fi diff --git a/patches/0001-BACKPORT-ib_core.patch b/patches/0001-BACKPORT-ib_core.patch index 0c7db91..fb4397a 100644 --- a/patches/0001-BACKPORT-ib_core.patch +++ b/patches/0001-BACKPORT-ib_core.patch @@ -3,19 +3,19 @@ Subject: [PATCH] BACKPORT: ib_core Signed-off-by: Vladimir Sokolovsky --- - drivers/infiniband/core/addr.c | 105 +++++++++++++++++++++++++++++++++ - drivers/infiniband/core/cm.c | 23 +++++++ - drivers/infiniband/core/cma.c | 43 +++++++++++++ - drivers/infiniband/core/fmr_pool.c | 7 ++ - drivers/infiniband/core/netlink.c | 20 ++++++ - drivers/infiniband/core/sa_query.c | 15 +++++ - drivers/infiniband/core/ucm.c | 38 ++++++++++++ - drivers/infiniband/core/ucma.c | 76 ++++++++++++++++++++++++ - drivers/infiniband/core/umem.c | 16 +++++ - drivers/infiniband/core/user_mad.c | 16 +++++ - drivers/infiniband/core/uverbs_cmd.c | 51 ++++++++++++++++ - drivers/infiniband/core/uverbs_main.c | 40 +++++++++++++ - 12 files changed, 450 insertions(+), 0 deletions(-) + drivers/infiniband/core/addr.c | 105 ++++++++++++++++++++++++++++++++++ + drivers/infiniband/core/cm.c | 23 ++++++++ + drivers/infiniband/core/cma.c | 43 ++++++++++++++ + drivers/infiniband/core/fmr_pool.c | 7 +++ + drivers/infiniband/core/netlink.c | 20 +++++++ + drivers/infiniband/core/sa_query.c | 15 +++++ + drivers/infiniband/core/ucm.c | 38 ++++++++++++ + drivers/infiniband/core/ucma.c | 76 ++++++++++++++++++++++++ + drivers/infiniband/core/umem.c | 16 ++++++ + drivers/infiniband/core/user_mad.c | 16 ++++++ + drivers/infiniband/core/uverbs_cmd.c | 51 +++++++++++++++++ + drivers/infiniband/core/uverbs_main.c | 40 +++++++++++++ + 12 files changed, 450 insertions(+) diff --git a/drivers/infiniband/core/addr.c b/drivers/infiniband/core/addr.c index xxxxxxx..xxxxxxx xxxxxx diff --git a/patches/0002-BACKPORT-mlx4-mlx4_core-mlx4_en-and-mlx4_ib.patch b/patches/0002-BACKPORT-mlx4-mlx4_core-mlx4_en-and-mlx4_ib.patch index 6c640a8..7cd7d02 100644 --- a/patches/0002-BACKPORT-mlx4-mlx4_core-mlx4_en-and-mlx4_ib.patch +++ b/patches/0002-BACKPORT-mlx4-mlx4_core-mlx4_en-and-mlx4_ib.patch @@ -3,20 +3,20 @@ Subject: [PATCH] BACKPORT: mlx4 (mlx4_core, mlx4_en and mlx4_ib) Signed-off-by: Vladimir Sokolovsky --- - drivers/infiniband/hw/mlx4/cm.c | 31 ++++ - drivers/infiniband/hw/mlx4/main.c | 16 ++ - drivers/net/ethernet/mellanox/mlx4/cmd.c | 6 + - drivers/net/ethernet/mellanox/mlx4/en_cq.c | 10 ++ - drivers/net/ethernet/mellanox/mlx4/en_dcb_nl.c | 12 ++ - drivers/net/ethernet/mellanox/mlx4/en_ethtool.c | 51 +++++++ - drivers/net/ethernet/mellanox/mlx4/en_netdev.c | 176 ++++++++++++++++++++++- - drivers/net/ethernet/mellanox/mlx4/en_rx.c | 29 ++++ - drivers/net/ethernet/mellanox/mlx4/en_tx.c | 36 +++++ - drivers/net/ethernet/mellanox/mlx4/eq.c | 8 + - drivers/net/ethernet/mellanox/mlx4/mlx4_en.h | 57 ++++++++ - include/linux/mlx4/cmd.h | 2 + - include/linux/mlx4/device.h | 6 + - 13 files changed, 439 insertions(+), 1 deletions(-) + drivers/infiniband/hw/mlx4/cm.c | 31 +++++ + drivers/infiniband/hw/mlx4/main.c | 16 +++ + drivers/net/ethernet/mellanox/mlx4/cmd.c | 6 + + drivers/net/ethernet/mellanox/mlx4/en_cq.c | 10 ++ + drivers/net/ethernet/mellanox/mlx4/en_dcb_nl.c | 12 ++ + drivers/net/ethernet/mellanox/mlx4/en_ethtool.c | 51 +++++++ + drivers/net/ethernet/mellanox/mlx4/en_netdev.c | 176 +++++++++++++++++++++++- + drivers/net/ethernet/mellanox/mlx4/en_rx.c | 29 ++++ + drivers/net/ethernet/mellanox/mlx4/en_tx.c | 36 +++++ + drivers/net/ethernet/mellanox/mlx4/eq.c | 8 ++ + drivers/net/ethernet/mellanox/mlx4/mlx4_en.h | 57 ++++++++ + include/linux/mlx4/cmd.h | 2 + + include/linux/mlx4/device.h | 6 + + 13 files changed, 439 insertions(+), 1 deletion(-) diff --git a/drivers/infiniband/hw/mlx4/cm.c b/drivers/infiniband/hw/mlx4/cm.c index xxxxxxx..xxxxxxx xxxxxx diff --git a/patches/0003-BACKPORT-ib_ipoib.patch b/patches/0003-BACKPORT-ib_ipoib.patch index 50bdd01..ec731a6 100644 --- a/patches/0003-BACKPORT-ib_ipoib.patch +++ b/patches/0003-BACKPORT-ib_ipoib.patch @@ -3,12 +3,12 @@ Subject: [PATCH] BACKPORT: ib_ipoib Signed-off-by: Vladimir Sokolovsky --- - drivers/infiniband/ulp/ipoib/ipoib.h | 3 ++ - drivers/infiniband/ulp/ipoib/ipoib_cm.c | 8 +++++ - drivers/infiniband/ulp/ipoib/ipoib_main.c | 37 ++++++++++++++++++++++++ - drivers/infiniband/ulp/ipoib/ipoib_multicast.c | 15 +++++++++ - drivers/infiniband/ulp/ipoib/ipoib_netlink.c | 8 +++++ - 5 files changed, 71 insertions(+), 0 deletions(-) + drivers/infiniband/ulp/ipoib/ipoib.h | 3 +++ + drivers/infiniband/ulp/ipoib/ipoib_cm.c | 8 ++++++ + drivers/infiniband/ulp/ipoib/ipoib_main.c | 37 ++++++++++++++++++++++++++ + drivers/infiniband/ulp/ipoib/ipoib_multicast.c | 15 +++++++++++ + drivers/infiniband/ulp/ipoib/ipoib_netlink.c | 8 ++++++ + 5 files changed, 71 insertions(+) diff --git a/drivers/infiniband/ulp/ipoib/ipoib.h b/drivers/infiniband/ulp/ipoib/ipoib.h index xxxxxxx..xxxxxxx xxxxxx diff --git a/patches/0004-iw_cxgb3-iw_cxgb4-Enable-header-file-inclusion-with-.patch b/patches/0004-iw_cxgb3-iw_cxgb4-Enable-header-file-inclusion-with-.patch index 92837f9..72d3ea3 100644 --- a/patches/0004-iw_cxgb3-iw_cxgb4-Enable-header-file-inclusion-with-.patch +++ b/patches/0004-iw_cxgb3-iw_cxgb4-Enable-header-file-inclusion-with-.patch @@ -1,5 +1,6 @@ From: Vipul Pandya -Subject: [PATCH] iw_cxgb3/iw_cxgb4: Enable header file inclusion with absolute path +Subject: [PATCH] iw_cxgb3/iw_cxgb4: Enable header file inclusion with absolute + path iw_cxgb3/iw_cxgb4 driver includes header files of cxgb3/cxgb4 drivers respectively. OFED build environment is not able to find the header files @@ -7,8 +8,8 @@ if absolute path is not given. Signed-off-by: Vipul Pandya --- - drivers/infiniband/hw/cxgb3/Makefile | 2 +- - drivers/infiniband/hw/cxgb4/Makefile | 2 +- + drivers/infiniband/hw/cxgb3/Makefile | 2 +- + drivers/infiniband/hw/cxgb4/Makefile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/infiniband/hw/cxgb3/Makefile b/drivers/infiniband/hw/cxgb3/Makefile diff --git a/patches/0005-BACKPORT-ib_srp.patch b/patches/0005-BACKPORT-ib_srp.patch index 62a4ef2..67426e8 100644 --- a/patches/0005-BACKPORT-ib_srp.patch +++ b/patches/0005-BACKPORT-ib_srp.patch @@ -3,8 +3,8 @@ Subject: [PATCH] BACKPORT: ib_srp Signed-off-by: Bart Van Assche --- - drivers/infiniband/ulp/srp/ib_srp.c | 91 ++++++++++++++++++++++++++++++++++- - 1 files changed, 89 insertions(+), 2 deletions(-) + drivers/infiniband/ulp/srp/ib_srp.c | 91 ++++++++++++++++++++++++++++++++++++- + 1 file changed, 89 insertions(+), 2 deletions(-) diff --git a/drivers/infiniband/ulp/srp/ib_srp.c b/drivers/infiniband/ulp/srp/ib_srp.c index xxxxxxx..xxxxxxx xxxxxx diff --git a/patches/0006-cxgb3-cxgb4-Fix-pr_fmt-warnings.patch b/patches/0006-cxgb3-cxgb4-Fix-pr_fmt-warnings.patch index d936cee..49e1aaf 100644 --- a/patches/0006-cxgb3-cxgb4-Fix-pr_fmt-warnings.patch +++ b/patches/0006-cxgb3-cxgb4-Fix-pr_fmt-warnings.patch @@ -3,10 +3,10 @@ Subject: [PATCH] cxgb3/cxgb4: Fix pr_fmt warnings Signed-off-by: Kumar Sanghvi --- - drivers/net/ethernet/chelsio/cxgb3/cxgb3_main.c | 1 + - drivers/net/ethernet/chelsio/cxgb3/cxgb3_offload.c | 1 + - drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c | 1 + - 3 files changed, 3 insertions(+), 0 deletions(-) + drivers/net/ethernet/chelsio/cxgb3/cxgb3_main.c | 1 + + drivers/net/ethernet/chelsio/cxgb3/cxgb3_offload.c | 1 + + drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c | 1 + + 3 files changed, 3 insertions(+) diff --git a/drivers/net/ethernet/chelsio/cxgb3/cxgb3_main.c b/drivers/net/ethernet/chelsio/cxgb3/cxgb3_main.c index xxxxxxx..xxxxxxx xxxxxx diff --git a/patches/0007-cxgb3-Backports-for-RHEL6.4-RHEL6.5-and-SLES11sp3.patch b/patches/0007-cxgb3-Backports-for-RHEL6.4-RHEL6.5-and-SLES11sp3.patch index 6aadf9a..6d778be 100644 --- a/patches/0007-cxgb3-Backports-for-RHEL6.4-RHEL6.5-and-SLES11sp3.patch +++ b/patches/0007-cxgb3-Backports-for-RHEL6.4-RHEL6.5-and-SLES11sp3.patch @@ -3,15 +3,15 @@ Subject: [PATCH] cxgb3: Backports for RHEL6.4, RHEL6.5 and SLES11sp3 Signed-off-by: Kumar Sanghvi --- - drivers/net/ethernet/chelsio/cxgb3/adapter.h | 19 +++ - drivers/net/ethernet/chelsio/cxgb3/common.h | 3 + - drivers/net/ethernet/chelsio/cxgb3/cxgb3_main.c | 118 +++++++++++++++++++- - drivers/net/ethernet/chelsio/cxgb3/cxgb3_offload.c | 107 ++++++++++++++++++- - drivers/net/ethernet/chelsio/cxgb3/l2t.c | 9 ++ - drivers/net/ethernet/chelsio/cxgb3/l2t.h | 5 + - drivers/net/ethernet/chelsio/cxgb3/sge.c | 46 ++++++++ - drivers/net/ethernet/chelsio/cxgb3/t3_hw.c | 4 + - drivers/net/ethernet/chelsio/cxgb3/xgmac.c | 17 +++- + drivers/net/ethernet/chelsio/cxgb3/adapter.h | 19 ++++ + drivers/net/ethernet/chelsio/cxgb3/common.h | 3 + + drivers/net/ethernet/chelsio/cxgb3/cxgb3_main.c | 118 ++++++++++++++++++++- + drivers/net/ethernet/chelsio/cxgb3/cxgb3_offload.c | 107 ++++++++++++++++++- + drivers/net/ethernet/chelsio/cxgb3/l2t.c | 9 ++ + drivers/net/ethernet/chelsio/cxgb3/l2t.h | 5 + + drivers/net/ethernet/chelsio/cxgb3/sge.c | 46 ++++++++ + drivers/net/ethernet/chelsio/cxgb3/t3_hw.c | 4 + + drivers/net/ethernet/chelsio/cxgb3/xgmac.c | 17 ++- 9 files changed, 325 insertions(+), 3 deletions(-) diff --git a/drivers/net/ethernet/chelsio/cxgb3/adapter.h b/drivers/net/ethernet/chelsio/cxgb3/adapter.h diff --git a/patches/0008-iw_cxgb3-Backports-for-RHEL6.4-RHEL6.5-and-SLES11sp3.patch b/patches/0008-iw_cxgb3-Backports-for-RHEL6.4-RHEL6.5-and-SLES11sp3.patch index 9da5869..67feb54 100644 --- a/patches/0008-iw_cxgb3-Backports-for-RHEL6.4-RHEL6.5-and-SLES11sp3.patch +++ b/patches/0008-iw_cxgb3-Backports-for-RHEL6.4-RHEL6.5-and-SLES11sp3.patch @@ -3,9 +3,9 @@ Subject: [PATCH] iw_cxgb3: Backports for RHEL6.4, RHEL6.5 and SLES11sp3 Signed-off-by: Kumar Sanghvi --- - drivers/infiniband/hw/cxgb3/iwch.h | 17 +++++++++++++- - drivers/infiniband/hw/cxgb3/iwch_cm.c | 39 +++++++++++++++++++++++++++++++++ - 2 files changed, 55 insertions(+), 1 deletions(-) + drivers/infiniband/hw/cxgb3/iwch.h | 17 ++++++++++++++- + drivers/infiniband/hw/cxgb3/iwch_cm.c | 39 +++++++++++++++++++++++++++++++++++ + 2 files changed, 55 insertions(+), 1 deletion(-) diff --git a/drivers/infiniband/hw/cxgb3/iwch.h b/drivers/infiniband/hw/cxgb3/iwch.h index xxxxxxx..xxxxxxx xxxxxx diff --git a/patches/0009-cxgb4-Backports-for-RHEL6.4-RHEL6.5-and-SLES11sp3.patch b/patches/0009-cxgb4-Backports-for-RHEL6.4-RHEL6.5-and-SLES11sp3.patch index 8cf45f0..99a6edd 100644 --- a/patches/0009-cxgb4-Backports-for-RHEL6.4-RHEL6.5-and-SLES11sp3.patch +++ b/patches/0009-cxgb4-Backports-for-RHEL6.4-RHEL6.5-and-SLES11sp3.patch @@ -3,9 +3,9 @@ Subject: [PATCH] cxgb4: Backports for RHEL6.4, RHEL6.5 and SLES11sp3 Signed-off-by: Kumar Sanghvi --- - drivers/net/ethernet/chelsio/cxgb4/cxgb4.h | 17 ++ - drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c | 208 ++++++++++++++++++++--- - drivers/net/ethernet/chelsio/cxgb4/sge.c | 108 ++++++++++++ + drivers/net/ethernet/chelsio/cxgb4/cxgb4.h | 17 ++ + drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c | 208 +++++++++++++++++++++--- + drivers/net/ethernet/chelsio/cxgb4/sge.c | 108 ++++++++++++ 3 files changed, 308 insertions(+), 25 deletions(-) diff --git a/drivers/net/ethernet/chelsio/cxgb4/cxgb4.h b/drivers/net/ethernet/chelsio/cxgb4/cxgb4.h diff --git a/patches/0010-iw_cxgb4-Backports-for-RHEL6.4-RHEL6.5-and-SLES11sp3.patch b/patches/0010-iw_cxgb4-Backports-for-RHEL6.4-RHEL6.5-and-SLES11sp3.patch index e4a7541..67f9169 100644 --- a/patches/0010-iw_cxgb4-Backports-for-RHEL6.4-RHEL6.5-and-SLES11sp3.patch +++ b/patches/0010-iw_cxgb4-Backports-for-RHEL6.4-RHEL6.5-and-SLES11sp3.patch @@ -3,10 +3,10 @@ Subject: [PATCH] iw_cxgb4: Backports for RHEL6.4, RHEL6.5 and SLES11sp3 Signed-off-by: Kumar Sanghvi --- - drivers/infiniband/hw/cxgb4/cm.c | 79 ++++++++++++++++++++++++++++++++ - drivers/infiniband/hw/cxgb4/iw_cxgb4.h | 17 +++++++ - drivers/infiniband/hw/cxgb4/mem.c | 1 + - 3 files changed, 97 insertions(+), 0 deletions(-) + drivers/infiniband/hw/cxgb4/cm.c | 79 ++++++++++++++++++++++++++++++++++ + drivers/infiniband/hw/cxgb4/iw_cxgb4.h | 17 ++++++++ + drivers/infiniband/hw/cxgb4/mem.c | 1 + + 3 files changed, 97 insertions(+) diff --git a/drivers/infiniband/hw/cxgb4/cm.c b/drivers/infiniband/hw/cxgb4/cm.c index xxxxxxx..xxxxxxx xxxxxx diff --git a/patches/0011-cxgb4-Update-driver-version-to-reflect-ofed.patch b/patches/0011-cxgb4-Update-driver-version-to-reflect-ofed.patch index 56edfe7..3929ce2 100644 --- a/patches/0011-cxgb4-Update-driver-version-to-reflect-ofed.patch +++ b/patches/0011-cxgb4-Update-driver-version-to-reflect-ofed.patch @@ -3,8 +3,8 @@ Subject: [PATCH] cxgb4: Update driver version to reflect ofed Signed-off-by: Kumar Sanghvi --- - drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) + drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c b/drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c index xxxxxxx..xxxxxxx xxxxxx diff --git a/patches/0012-cxgb3-Update-driver-version-to-reflect-ofed.patch b/patches/0012-cxgb3-Update-driver-version-to-reflect-ofed.patch index 72f3ebc..e99d15b 100644 --- a/patches/0012-cxgb3-Update-driver-version-to-reflect-ofed.patch +++ b/patches/0012-cxgb3-Update-driver-version-to-reflect-ofed.patch @@ -3,8 +3,8 @@ Subject: [PATCH] cxgb3: Update driver version to reflect ofed Signed-off-by: Kumar Sanghvi --- - drivers/net/ethernet/chelsio/cxgb3/version.h | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) + drivers/net/ethernet/chelsio/cxgb3/version.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/ethernet/chelsio/cxgb3/version.h b/drivers/net/ethernet/chelsio/cxgb3/version.h index xxxxxxx..xxxxxxx xxxxxx diff --git a/patches/0013-IB-qib-backport-qib_fs.c-before-2.6.35.patch b/patches/0013-IB-qib-backport-qib_fs.c-before-2.6.35.patch index a71d90f..21b22d6 100644 --- a/patches/0013-IB-qib-backport-qib_fs.c-before-2.6.35.patch +++ b/patches/0013-IB-qib-backport-qib_fs.c-before-2.6.35.patch @@ -3,8 +3,8 @@ Subject: [PATCH] IB/qib: backport qib_fs.c before 2.6.35 Signed-off-by: Mike Marciniszyn --- - drivers/infiniband/hw/qib/qib_fs.c | 29 +++++++++++++++++++++++++++++ - 1 files changed, 29 insertions(+), 0 deletions(-) + drivers/infiniband/hw/qib/qib_fs.c | 29 +++++++++++++++++++++++++++++ + 1 file changed, 29 insertions(+) diff --git a/drivers/infiniband/hw/qib/qib_fs.c b/drivers/infiniband/hw/qib/qib_fs.c index xxxxxxx..xxxxxxx xxxxxx diff --git a/patches/0014-IB-qib-backport-3.2-for-pinned_vm-field.patch b/patches/0014-IB-qib-backport-3.2-for-pinned_vm-field.patch index a57d331..43da9fa 100644 --- a/patches/0014-IB-qib-backport-3.2-for-pinned_vm-field.patch +++ b/patches/0014-IB-qib-backport-3.2-for-pinned_vm-field.patch @@ -3,8 +3,8 @@ Subject: [PATCH] IB/qib: backport < 3.2 for pinned_vm field Signed-off-by: Mike Marciniszyn --- - drivers/infiniband/hw/qib/qib_user_pages.c | 8 ++++++++ - 1 files changed, 8 insertions(+), 0 deletions(-) + drivers/infiniband/hw/qib/qib_user_pages.c | 8 ++++++++ + 1 file changed, 8 insertions(+) diff --git a/drivers/infiniband/hw/qib/qib_user_pages.c b/drivers/infiniband/hw/qib/qib_user_pages.c index xxxxxxx..xxxxxxx xxxxxx diff --git a/patches/0015-IB-ipath-backport-qib_fs.c-before-2.6.35.patch b/patches/0015-IB-ipath-backport-qib_fs.c-before-2.6.35.patch index f27a3aa..c38cb5b 100644 --- a/patches/0015-IB-ipath-backport-qib_fs.c-before-2.6.35.patch +++ b/patches/0015-IB-ipath-backport-qib_fs.c-before-2.6.35.patch @@ -3,8 +3,8 @@ Subject: [PATCH] IB/ipath: backport qib_fs.c before 2.6.35 Signed-off-by: Mike Marciniszyn --- - drivers/infiniband/hw/ipath/ipath_fs.c | 26 ++++++++++++++++++++++++++ - 1 files changed, 26 insertions(+), 0 deletions(-) + drivers/infiniband/hw/ipath/ipath_fs.c | 26 ++++++++++++++++++++++++++ + 1 file changed, 26 insertions(+) diff --git a/drivers/infiniband/hw/ipath/ipath_fs.c b/drivers/infiniband/hw/ipath/ipath_fs.c index xxxxxxx..xxxxxxx xxxxxx diff --git a/patches/0016-IB-ipath-backport-3.2-for-pinned_vm-field.patch b/patches/0016-IB-ipath-backport-3.2-for-pinned_vm-field.patch index d8d2291..94e0c8e 100644 --- a/patches/0016-IB-ipath-backport-3.2-for-pinned_vm-field.patch +++ b/patches/0016-IB-ipath-backport-3.2-for-pinned_vm-field.patch @@ -3,8 +3,8 @@ Subject: [PATCH] IB/ipath: backport < 3.2 for pinned_vm field Signed-off-by: Mike Marciniszyn --- - drivers/infiniband/hw/ipath/ipath_user_pages.c | 12 ++++++++++++ - 1 files changed, 12 insertions(+), 0 deletions(-) + drivers/infiniband/hw/ipath/ipath_user_pages.c | 12 ++++++++++++ + 1 file changed, 12 insertions(+) diff --git a/drivers/infiniband/hw/ipath/ipath_user_pages.c b/drivers/infiniband/hw/ipath/ipath_user_pages.c index xxxxxxx..xxxxxxx xxxxxx diff --git a/patches/0017-Deal-with-struct-pci-changes.patch b/patches/0017-Deal-with-struct-pci-changes.patch index c6fc73c..e1db7a9 100644 --- a/patches/0017-Deal-with-struct-pci-changes.patch +++ b/patches/0017-Deal-with-struct-pci-changes.patch @@ -3,8 +3,8 @@ Subject: [PATCH] Deal with struct pci changes. Signed-off-by: Dennis Dalessandro --- - drivers/infiniband/hw/qib/qib_pcie.c | 21 +++++++++++++++++++++ - 1 files changed, 21 insertions(+), 0 deletions(-) + drivers/infiniband/hw/qib/qib_pcie.c | 21 +++++++++++++++++++++ + 1 file changed, 21 insertions(+) diff --git a/drivers/infiniband/hw/qib/qib_pcie.c b/drivers/infiniband/hw/qib/qib_pcie.c index xxxxxxx..xxxxxxx xxxxxx diff --git a/patches/0018-Work-around-new-idr-style.patch b/patches/0018-Work-around-new-idr-style.patch index 4b1f97f..ed0e5d1 100644 --- a/patches/0018-Work-around-new-idr-style.patch +++ b/patches/0018-Work-around-new-idr-style.patch @@ -3,8 +3,8 @@ Subject: [PATCH] Work around new idr style Signed-off-by: Dennis Dalessandro --- - drivers/infiniband/hw/qib/qib_init.c | 23 +++++++++++++++++++++-- - 1 files changed, 21 insertions(+), 2 deletions(-) + drivers/infiniband/hw/qib/qib_init.c | 23 +++++++++++++++++++++-- + 1 file changed, 21 insertions(+), 2 deletions(-) diff --git a/drivers/infiniband/hw/qib/qib_init.c b/drivers/infiniband/hw/qib/qib_init.c index xxxxxxx..xxxxxxx xxxxxx diff --git a/patches/0019-RDMA-nes-3.12-backport-patches.patch b/patches/0019-RDMA-nes-3.12-backport-patches.patch index 6bc566e..d175a19 100644 --- a/patches/0019-RDMA-nes-3.12-backport-patches.patch +++ b/patches/0019-RDMA-nes-3.12-backport-patches.patch @@ -3,11 +3,11 @@ Subject: [PATCH] RDMA/nes: 3.12 backport patches Signed-off-by: Tatyana Nikolova --- - drivers/infiniband/hw/nes/nes.c | 4 ++ - drivers/infiniband/hw/nes/nes_cm.c | 14 +++++- - drivers/infiniband/hw/nes/nes_hw.c | 28 +++++++++-- - drivers/infiniband/hw/nes/nes_hw.h | 6 ++ - drivers/infiniband/hw/nes/nes_nic.c | 96 ++++++++++++++++++++++++++++++++-- + drivers/infiniband/hw/nes/nes.c | 4 ++ + drivers/infiniband/hw/nes/nes_cm.c | 14 +++++- + drivers/infiniband/hw/nes/nes_hw.c | 28 +++++++++-- + drivers/infiniband/hw/nes/nes_hw.h | 6 +++ + drivers/infiniband/hw/nes/nes_nic.c | 96 ++++++++++++++++++++++++++++++++++--- 5 files changed, 137 insertions(+), 11 deletions(-) diff --git a/drivers/infiniband/hw/nes/nes.c b/drivers/infiniband/hw/nes/nes.c diff --git a/patches/0020-scsi-Makefile-Avoid-recompilation-of-the-whole-SCSI-.patch b/patches/0020-scsi-Makefile-Avoid-recompilation-of-the-whole-SCSI-.patch index f1cc1ed..eda5e47 100644 --- a/patches/0020-scsi-Makefile-Avoid-recompilation-of-the-whole-SCSI-.patch +++ b/patches/0020-scsi-Makefile-Avoid-recompilation-of-the-whole-SCSI-.patch @@ -5,8 +5,8 @@ Leave only SRP related staff Signed-off-by: Vladimir Sokolovsky --- - drivers/scsi/Makefile | 187 ------------------------------------------------- - 1 files changed, 0 insertions(+), 187 deletions(-) + drivers/scsi/Makefile | 187 -------------------------------------------------- + 1 file changed, 187 deletions(-) diff --git a/drivers/scsi/Makefile b/drivers/scsi/Makefile index xxxxxxx..xxxxxxx xxxxxx diff --git a/patches/0021-ocrdma-Enable-header-file-inclusion-with-absolute-pa.patch b/patches/0021-ocrdma-Enable-header-file-inclusion-with-absolute-pa.patch index c5131f2..2781441 100644 --- a/patches/0021-ocrdma-Enable-header-file-inclusion-with-absolute-pa.patch +++ b/patches/0021-ocrdma-Enable-header-file-inclusion-with-absolute-pa.patch @@ -7,8 +7,8 @@ if absolute path is not given. Signed-off-by: Vladimir Sokolovsky --- - drivers/infiniband/hw/ocrdma/Makefile | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) + drivers/infiniband/hw/ocrdma/Makefile | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/infiniband/hw/ocrdma/Makefile b/drivers/infiniband/hw/ocrdma/Makefile index xxxxxxx..xxxxxxx xxxxxx diff --git a/patches/0022-ocrdma-idr_alloc-backport-for-kernels-3.9.patch b/patches/0022-ocrdma-idr_alloc-backport-for-kernels-3.9.patch index 8f286f3..0b172bc 100644 --- a/patches/0022-ocrdma-idr_alloc-backport-for-kernels-3.9.patch +++ b/patches/0022-ocrdma-idr_alloc-backport-for-kernels-3.9.patch @@ -3,8 +3,8 @@ Subject: [PATCH] ocrdma: idr_alloc backport for kernels < 3.9 Signed-off-by: Vladimir Sokolovsky --- - drivers/infiniband/hw/ocrdma/ocrdma_main.c | 18 ++++++++++++++++++ - 1 files changed, 18 insertions(+), 0 deletions(-) + drivers/infiniband/hw/ocrdma/ocrdma_main.c | 18 ++++++++++++++++++ + 1 file changed, 18 insertions(+) diff --git a/drivers/infiniband/hw/ocrdma/ocrdma_main.c b/drivers/infiniband/hw/ocrdma/ocrdma_main.c index xxxxxxx..xxxxxxx xxxxxx diff --git a/patches/0023-nfsrdma-backport-for-RHEL6.5.patch b/patches/0023-nfsrdma-Backport-for-rhel6.5.patch similarity index 88% rename from patches/0023-nfsrdma-backport-for-RHEL6.5.patch rename to patches/0023-nfsrdma-Backport-for-rhel6.5.patch index 17bf6f4..6d184fb 100644 --- a/patches/0023-nfsrdma-backport-for-RHEL6.5.patch +++ b/patches/0023-nfsrdma-Backport-for-rhel6.5.patch @@ -1,5 +1,17 @@ +From: "Jeffrey C. Becker" +Subject: [PATCH] nfsrdma: Backport for rhel6.5 + +Signed-off-by: Jeffrey C. Becker +--- + net/sunrpc/xprtrdma/rpc_rdma.c | 16 ++++++++++++++++ + net/sunrpc/xprtrdma/svc_rdma_recvfrom.c | 9 +++++++++ + net/sunrpc/xprtrdma/svc_rdma_sendto.c | 6 ++++++ + net/sunrpc/xprtrdma/svc_rdma_transport.c | 4 ++++ + net/sunrpc/xprtrdma/transport.c | 4 ++++ + 5 files changed, 39 insertions(+) + diff --git a/net/sunrpc/xprtrdma/rpc_rdma.c b/net/sunrpc/xprtrdma/rpc_rdma.c -index e03725b..410b551 100644 +index xxxxxxx..xxxxxxx xxxxxx --- a/net/sunrpc/xprtrdma/rpc_rdma.c +++ b/net/sunrpc/xprtrdma/rpc_rdma.c @@ -338,9 +338,17 @@ rpcrdma_inline_pullup(struct rpc_rqst *rqst, int pad) @@ -40,7 +52,7 @@ index e03725b..410b551 100644 copy_len -= curlen; if (copy_len == 0) diff --git a/net/sunrpc/xprtrdma/svc_rdma_recvfrom.c b/net/sunrpc/xprtrdma/svc_rdma_recvfrom.c -index 0ce7552..afd46ee 100644 +index xxxxxxx..xxxxxxx xxxxxx --- a/net/sunrpc/xprtrdma/svc_rdma_recvfrom.c +++ b/net/sunrpc/xprtrdma/svc_rdma_recvfrom.c @@ -524,8 +524,13 @@ next_sge: @@ -70,7 +82,7 @@ index 0ce7552..afd46ee 100644 /* Rebuild rq_arg head and tail. */ rqstp->rq_arg.head[0] = head->arg.head[0]; diff --git a/net/sunrpc/xprtrdma/svc_rdma_sendto.c b/net/sunrpc/xprtrdma/svc_rdma_sendto.c -index c1d124d..59d462d 100644 +index xxxxxxx..xxxxxxx xxxxxx --- a/net/sunrpc/xprtrdma/svc_rdma_sendto.c +++ b/net/sunrpc/xprtrdma/svc_rdma_sendto.c @@ -548,7 +548,9 @@ static int send_reply(struct svcxprt_rdma *rdma, @@ -97,7 +109,7 @@ index c1d124d..59d462d 100644 ctxt->count++; rqstp->rq_respages[page_no] = NULL; diff --git a/net/sunrpc/xprtrdma/svc_rdma_transport.c b/net/sunrpc/xprtrdma/svc_rdma_transport.c -index 62e4f9b..f4d65b1 100644 +index xxxxxxx..xxxxxxx xxxxxx --- a/net/sunrpc/xprtrdma/svc_rdma_transport.c +++ b/net/sunrpc/xprtrdma/svc_rdma_transport.c @@ -445,7 +445,11 @@ static struct svcxprt_rdma *rdma_create_xprt(struct svc_serv *serv, @@ -113,7 +125,7 @@ index 62e4f9b..f4d65b1 100644 INIT_LIST_HEAD(&cma_xprt->sc_dto_q); INIT_LIST_HEAD(&cma_xprt->sc_rq_dto_q); diff --git a/net/sunrpc/xprtrdma/transport.c b/net/sunrpc/xprtrdma/transport.c -index 285dc08..b53d9f3 100644 +index xxxxxxx..xxxxxxx xxxxxx --- a/net/sunrpc/xprtrdma/transport.c +++ b/net/sunrpc/xprtrdma/transport.c @@ -51,7 +51,9 @@ diff --git a/patches/0024-cxgb4-Backport-for-40G-support.patch b/patches/0024-cxgb4-Backport-for-40G-support-for-Chelsio.patch similarity index 61% rename from patches/0024-cxgb4-Backport-for-40G-support.patch rename to patches/0024-cxgb4-Backport-for-40G-support-for-Chelsio.patch index 189c07b..d6bf74f 100644 --- a/patches/0024-cxgb4-Backport-for-40G-support.patch +++ b/patches/0024-cxgb4-Backport-for-40G-support-for-Chelsio.patch @@ -1,8 +1,16 @@ +From: Kumar Sanghvi +Subject: [PATCH] cxgb4: Backport for 40G support for Chelsio + +Signed-off-by: Kumar Sanghvi +--- + drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c | 5 +++++ + 1 file changed, 5 insertions(+) + diff --git a/drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c b/drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c -index c1f8e85..6b90eae 100644 +index xxxxxxx..xxxxxxx xxxxxx --- a/drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c +++ b/drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c -@@ -2191,6 +2191,11 @@ static int identify_port(struct net_device *dev, +@@ -2250,6 +2250,11 @@ static int identify_port(struct net_device *dev, return t4_identify_port(adap, adap->fn, netdev2pinfo(dev)->viid, val); } diff --git a/patches/0025-be2net-Backports-for-RHEL-6.4-RHEL-6.5-and-SLES11SP3.patch b/patches/0025-be2net-Backports-for-RHEL-6.4-RHEL-6.5-and-SLES11SP3.patch index d800fd6..9a907c2 100644 --- a/patches/0025-be2net-Backports-for-RHEL-6.4-RHEL-6.5-and-SLES11SP3.patch +++ b/patches/0025-be2net-Backports-for-RHEL-6.4-RHEL-6.5-and-SLES11SP3.patch @@ -1,24 +1,22 @@ -From 281ca94c09468c699d276f023949dd8e4750d26d Mon Sep 17 00:00:00 2001 From: Devesh Sharma -Date: Fri, 21 Feb 2014 23:30:40 +0530 -Subject: [PATCH 1/2] be2net: Backports for RHEL 6.4, RHEL 6.5 and SLES11SP3 +Subject: [PATCH] be2net: Backports for RHEL 6.4, RHEL 6.5 and SLES11SP3 Signed-off-by: Selvin Xavier Signed-off-by: Devesh Sharma --- - drivers/net/ethernet/emulex/benet/Makefile | 2 +- - drivers/net/ethernet/emulex/benet/be.h | 8 +- - drivers/net/ethernet/emulex/benet/be_cmds.c | 6 +- - drivers/net/ethernet/emulex/benet/be_compat.c | 72 +++++++++++ - drivers/net/ethernet/emulex/benet/be_compat.h | 97 +++++++++++++++ - drivers/net/ethernet/emulex/benet/be_ethtool.c | 17 ++- - drivers/net/ethernet/emulex/benet/be_main.c | 158 ++++++++++++++++++++--- + drivers/net/ethernet/emulex/benet/Makefile | 2 +- + drivers/net/ethernet/emulex/benet/be.h | 8 +- + drivers/net/ethernet/emulex/benet/be_cmds.c | 6 +- + drivers/net/ethernet/emulex/benet/be_compat.c | 72 +++++++++++ + drivers/net/ethernet/emulex/benet/be_compat.h | 97 +++++++++++++++ + drivers/net/ethernet/emulex/benet/be_ethtool.c | 17 ++- + drivers/net/ethernet/emulex/benet/be_main.c | 158 +++++++++++++++++++++---- 7 files changed, 333 insertions(+), 27 deletions(-) create mode 100644 drivers/net/ethernet/emulex/benet/be_compat.c create mode 100644 drivers/net/ethernet/emulex/benet/be_compat.h diff --git a/drivers/net/ethernet/emulex/benet/Makefile b/drivers/net/ethernet/emulex/benet/Makefile -index 1a91b27..a32863b 100644 +index xxxxxxx..xxxxxxx xxxxxx --- a/drivers/net/ethernet/emulex/benet/Makefile +++ b/drivers/net/ethernet/emulex/benet/Makefile @@ -4,4 +4,4 @@ @@ -28,7 +26,7 @@ index 1a91b27..a32863b 100644 -be2net-y := be_main.o be_cmds.o be_ethtool.o be_roce.o +be2net-y := be_main.o be_cmds.o be_ethtool.o be_roce.o be_compat.o diff --git a/drivers/net/ethernet/emulex/benet/be.h b/drivers/net/ethernet/emulex/benet/be.h -index db02023..fea7156 100644 +index xxxxxxx..xxxxxxx xxxxxx --- a/drivers/net/ethernet/emulex/benet/be.h +++ b/drivers/net/ethernet/emulex/benet/be.h @@ -20,6 +20,7 @@ @@ -71,7 +69,7 @@ index db02023..fea7156 100644 #define be_physfn(adapter) (!adapter->virtfn) diff --git a/drivers/net/ethernet/emulex/benet/be_cmds.c b/drivers/net/ethernet/emulex/benet/be_cmds.c -index c08fd32..cac9862 100644 +index xxxxxxx..xxxxxxx xxxxxx --- a/drivers/net/ethernet/emulex/benet/be_cmds.c +++ b/drivers/net/ethernet/emulex/benet/be_cmds.c @@ -1823,7 +1823,11 @@ int be_cmd_rx_filter(struct be_adapter *adapter, u32 flags, u32 value) @@ -277,7 +275,7 @@ index 0000000..3daa68a + +#endif /* BE_COMPAT_H */ diff --git a/drivers/net/ethernet/emulex/benet/be_ethtool.c b/drivers/net/ethernet/emulex/benet/be_ethtool.c -index b440a1f..a739c20 100644 +index xxxxxxx..xxxxxxx xxxxxx --- a/drivers/net/ethernet/emulex/benet/be_ethtool.c +++ b/drivers/net/ethernet/emulex/benet/be_ethtool.c @@ -638,7 +638,7 @@ be_set_pauseparam(struct net_device *netdev, struct ethtool_pauseparam *ecmd) @@ -350,7 +348,7 @@ index b440a1f..a739c20 100644 +#endif }; diff --git a/drivers/net/ethernet/emulex/benet/be_main.c b/drivers/net/ethernet/emulex/benet/be_main.c -index 2c38cc4..2ff0d29 100644 +index xxxxxxx..xxxxxxx xxxxxx --- a/drivers/net/ethernet/emulex/benet/be_main.c +++ b/drivers/net/ethernet/emulex/benet/be_main.c @@ -146,8 +146,8 @@ static int be_queue_alloc(struct be_adapter *adapter, struct be_queue_info *q, @@ -671,6 +669,3 @@ index 2c38cc4..2ff0d29 100644 if (cmd->va == NULL) return -1; return 0; --- -1.7.1 - diff --git a/patches/0025-nfsrdma-backport-for-SLES11sp3.patch b/patches/0026-nfsrdma-Backport-for-sles11sp3.patch similarity index 72% rename from patches/0025-nfsrdma-backport-for-SLES11sp3.patch rename to patches/0026-nfsrdma-Backport-for-sles11sp3.patch index c899937..350b98a 100644 --- a/patches/0025-nfsrdma-backport-for-SLES11sp3.patch +++ b/patches/0026-nfsrdma-Backport-for-sles11sp3.patch @@ -1,8 +1,16 @@ +From: "Jeffrey C. Becker" +Subject: [PATCH] nfsrdma: Backport for sles11sp3 + +Signed-off-by: Jeffrey C. Becker +--- + net/sunrpc/xprtrdma/transport.c | 13 +++++++++++++ + 1 file changed, 13 insertions(+) + diff --git a/net/sunrpc/xprtrdma/transport.c b/net/sunrpc/xprtrdma/transport.c -index 285dc08..ab74500 100644 +index xxxxxxx..xxxxxxx xxxxxx --- a/net/sunrpc/xprtrdma/transport.c +++ b/net/sunrpc/xprtrdma/transport.c -@@ -279,7 +281,9 @@ xprt_setup_rdma(struct xprt_create *args) +@@ -281,7 +281,9 @@ xprt_setup_rdma(struct xprt_create *args) } xprt = xprt_alloc(args->net, sizeof(struct rpcrdma_xprt), @@ -12,7 +20,7 @@ index 285dc08..ab74500 100644 xprt_rdma_slot_table_entries); if (xprt == NULL) { dprintk("RPC: %s: couldn't allocate rpcrdma_xprt\n", -@@ -448,8 +452,15 @@ xprt_rdma_connect(struct rpc_xprt *xprt, struct rpc_task *task) +@@ -450,8 +452,15 @@ xprt_rdma_connect(struct rpc_xprt *xprt, struct rpc_task *task) } static int @@ -28,7 +36,7 @@ index 285dc08..ab74500 100644 struct rpcrdma_xprt *r_xprt = rpcx_to_rdmax(xprt); int credits = atomic_read(&r_xprt->rx_buf.rb_credits); -@@ -461,7 +472,11 @@ xprt_rdma_reserve_xprt(struct rpc_xprt *xprt, struct rpc_task *task) +@@ -463,7 +472,11 @@ xprt_rdma_reserve_xprt(struct rpc_xprt *xprt, struct rpc_task *task) BUG_ON(r_xprt->rx_buf.rb_cwndscale <= 0); } xprt->cwnd = credits * r_xprt->rx_buf.rb_cwndscale; diff --git a/patches/0026-be2net-update-version-string.patch b/patches/0027-be2net-update-version-string.patch similarity index 69% rename from patches/0026-be2net-update-version-string.patch rename to patches/0027-be2net-update-version-string.patch index b0cec46..ffddca6 100644 --- a/patches/0026-be2net-update-version-string.patch +++ b/patches/0027-be2net-update-version-string.patch @@ -1,6 +1,4 @@ -From 5568060c3ed38e76e3a7e3e684545f546850a9a6 Mon Sep 17 00:00:00 2001 From: Devesh Sharma -Date: Fri, 21 Feb 2014 11:23:34 -0800 Subject: [PATCH] be2net: update version string The version string of be2net driver is updated. @@ -8,22 +6,19 @@ The version string of be2net driver is updated. Signed-off-by: Devesh Sharma Signed-off-by: Selvin Xavier --- - drivers/net/ethernet/emulex/benet/be.h | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) + drivers/net/ethernet/emulex/benet/be.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/ethernet/emulex/benet/be.h b/drivers/net/ethernet/emulex/benet/be.h -index db02023..54b6ab5 100644 +index xxxxxxx..xxxxxxx xxxxxx --- a/drivers/net/ethernet/emulex/benet/be.h +++ b/drivers/net/ethernet/emulex/benet/be.h -@@ -34,7 +34,7 @@ - #include "be_hw.h" +@@ -37,7 +37,7 @@ #include "be_roce.h" + #include "be_compat.h" -#define DRV_VER "4.9.134.0u" +#define DRV_VER "4.9.134.0u-ofed" #define DRV_NAME "be2net" #define BE_NAME "Emulex BladeEngine2" #define BE3_NAME "Emulex BladeEngine3" --- -1.7.0.4 - diff --git a/patches/0028-mlx4_en-Backport-for-RHEL7.0.patch b/patches/0028-mlx4_en-Backport-for-RHEL7.0.patch new file mode 100644 index 0000000..3680b5c --- /dev/null +++ b/patches/0028-mlx4_en-Backport-for-RHEL7.0.patch @@ -0,0 +1,37 @@ +From: Vladimir Sokolovsky +Subject: [PATCH] mlx4_en: Backport for RHEL7.0 + +Signed-off-by: Vladimir Sokolovsky +--- + drivers/net/ethernet/mellanox/mlx4/en_netdev.c | 2 ++ + drivers/net/ethernet/mellanox/mlx4/en_rx.c | 2 ++ + 2 files changed, 4 insertions(+) + +diff --git a/drivers/net/ethernet/mellanox/mlx4/en_netdev.c b/drivers/net/ethernet/mellanox/mlx4/en_netdev.c +index xxxxxxx..xxxxxxx xxxxxx +--- a/drivers/net/ethernet/mellanox/mlx4/en_netdev.c ++++ b/drivers/net/ethernet/mellanox/mlx4/en_netdev.c +@@ -38,7 +38,9 @@ + #include + #include + #include ++#ifdef CONFIG_NET_RX_BUSY_POLL + #include ++#endif + + #include + #include +diff --git a/drivers/net/ethernet/mellanox/mlx4/en_rx.c b/drivers/net/ethernet/mellanox/mlx4/en_rx.c +index xxxxxxx..xxxxxxx xxxxxx +--- a/drivers/net/ethernet/mellanox/mlx4/en_rx.c ++++ b/drivers/net/ethernet/mellanox/mlx4/en_rx.c +@@ -31,7 +31,9 @@ + * + */ + ++#ifdef CONFIG_NET_RX_BUSY_POLL + #include ++#endif + #include + #include + #include -- 2.41.0