diff options
| author | Paul Gortmaker <paul.gortmaker@windriver.com> | 2018-07-03 23:05:13 -0400 |
|---|---|---|
| committer | Paul Gortmaker <paul.gortmaker@windriver.com> | 2018-07-03 23:05:13 -0400 |
| commit | 196b32dbb5969d8517ac982ade2bad71a1638204 (patch) | |
| tree | 314fae30d478e9d23a79fd9dd10079e680195919 | |
| parent | 1783b96329a94e6985c40621a6b2dc58f1ae156c (diff) | |
| download | longterm-queue-4.12-196b32dbb5969d8517ac982ade2bad71a1638204.tar.gz | |
IB: drop patch n/a for 4.12
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
| -rw-r--r-- | queue/IB-core-Avoid-unnecessary-return-value-check.patch | 47 | ||||
| -rw-r--r-- | queue/series | 1 |
2 files changed, 0 insertions, 48 deletions
diff --git a/queue/IB-core-Avoid-unnecessary-return-value-check.patch b/queue/IB-core-Avoid-unnecessary-return-value-check.patch deleted file mode 100644 index 45b6c1f..0000000 --- a/queue/IB-core-Avoid-unnecessary-return-value-check.patch +++ /dev/null @@ -1,47 +0,0 @@ -From 2e4c85c6edc80fa532b2c7e1eb3597ef4d4bbb8f Mon Sep 17 00:00:00 2001 -From: Parav Pandit <parav@mellanox.com> -Date: Thu, 2 Nov 2017 15:22:27 +0200 -Subject: [PATCH] IB/core: Avoid unnecessary return value check - -commit 2e4c85c6edc80fa532b2c7e1eb3597ef4d4bbb8f upstream. - -Since there is nothing done with non zero return value, such check is -avoided. - -Signed-off-by: Parav Pandit <parav@mellanox.com> -Reviewed-by: Daniel Jurgens <danielj@mellanox.com> -Signed-off-by: Leon Romanovsky <leon@kernel.org> -Signed-off-by: Doug Ledford <dledford@redhat.com> - -diff --git a/drivers/infiniband/core/security.c b/drivers/infiniband/core/security.c -index 88bdafb297f5..455cba7f9640 100644 ---- a/drivers/infiniband/core/security.c -+++ b/drivers/infiniband/core/security.c -@@ -692,20 +692,13 @@ void ib_mad_agent_security_cleanup(struct ib_mad_agent *agent) - - int ib_mad_enforce_security(struct ib_mad_agent_private *map, u16 pkey_index) - { -- int ret; -- - if (map->agent.qp->qp_type == IB_QPT_SMI && !map->agent.smp_allowed) - return -EACCES; - -- ret = ib_security_pkey_access(map->agent.device, -- map->agent.port_num, -- pkey_index, -- map->agent.security); -- -- if (ret) -- return ret; -- -- return 0; -+ return ib_security_pkey_access(map->agent.device, -+ map->agent.port_num, -+ pkey_index, -+ map->agent.security); - } - - #endif /* CONFIG_SECURITY_INFINIBAND */ --- -2.15.0 - diff --git a/queue/series b/queue/series index 0413f18..564cb99 100644 --- a/queue/series +++ b/queue/series @@ -55,7 +55,6 @@ bus-arm-cci-Fix-use-of-smp_processor_id-in-preemptib.patch bus-arm-ccn-Check-memory-allocation-failure.patch bus-arm-ccn-Fix-use-of-smp_processor_id-in-preemptib.patch bus-arm-ccn-fix-module-unloading-Error-Removing-stat.patch -IB-core-Avoid-unnecessary-return-value-check.patch crypto-talitos-fix-AEAD-test-failures.patch crypto-talitos-fix-memory-corruption-on-SEC2.patch crypto-talitos-fix-setkey-to-check-key-weakness.patch |