]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
Revert "RDMA/irdma: Update Kconfig"
authorWentao Guan <guanwentao@uniontech.com>
Mon, 24 Nov 2025 02:14:59 +0000 (10:14 +0800)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 1 Dec 2025 10:43:37 +0000 (11:43 +0100)
Revert commit 8ced3cb73ccd20e744deab7b49f2b7468c984eb2 which is upstream
commit 060842fed53f77a73824c9147f51dc6746c1267a

It causes regression in 6.12.58 stable, no issues in upstream.

The Kconfig dependency change 060842fed53f ("RDMA/irdma: Update Kconfig")
went in linux kernel 6.18 where RDMA IDPF support was merged.

Even though IDPF driver exists in older kernels, it doesn't provide RDMA
support so there is no need for IRDMA to depend on IDPF in kernels <= 6.17.

Link: https://lore.kernel.org/all/IA1PR11MB7727692DE0ECFE84E9B52F02CBD5A@IA1PR11MB7727.namprd11.prod.outlook.com/
Link: https://lore.kernel.org/all/IA1PR11MB772718B36A3B27D2F07B0109CBD5A@IA1PR11MB7727.namprd11.prod.outlook.com/
Cc: stable@vger.kernel.org # v6.12.58
Signed-off-by: Tatyana Nikolova <tatyana.e.nikolova@intel.com>
Signed-off-by: Wentao Guan <guanwentao@uniontech.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
drivers/infiniband/hw/irdma/Kconfig

index 41660203e00496dddc2e5b42964303e3a1e473df..b6f9c41bca51db1dcc83162fa0db8a269a1d8bf9 100644 (file)
@@ -4,10 +4,9 @@ config INFINIBAND_IRDMA
        depends on INET
        depends on IPV6 || !IPV6
        depends on PCI
-       depends on IDPF && ICE && I40E
+       depends on ICE && I40E
        select GENERIC_ALLOCATOR
        select AUXILIARY_BUS
        help
-         This is an Intel(R) Ethernet Protocol Driver for RDMA that
-         supports IPU E2000 (RoCEv2), E810 (iWARP/RoCEv2) and X722 (iWARP)
-         network devices.
+         This is an Intel(R) Ethernet Protocol Driver for RDMA driver
+         that support E810 (iWARP/RoCE) and X722 (iWARP) network devices.