From 918040cc4c92a5a92fa0ee61765e9580ee3b67f4 Mon Sep 17 00:00:00 2001 From: "Luis R. Rodriguez" Date: Thu, 14 Jun 2012 15:39:59 -0700 Subject: [PATCH] compat-wireless: remove patches/63-request_module_nowait.patch This is no longer required due to patch: commit d4b10483223cf1a3fd2057785b12e2790a961867 Author: Johannes Berg Date: Tue Jun 12 19:50:43 2012 +0200 iwlwifi: use request_module instead of _nowait Since request_module_nowait() can't be backported use request_module() instead -- we don't need the asynchronous behaviour of request_module_nowait() here since we're running in the firmware request work struct. Tested-by: Donald H Fry Reviewed-by: Donald H Fry Reviewed-by: Emmanuel Grumbach Signed-off-by: Johannes Berg Signed-off-by: Luis R. Rodriguez --- patches/63-request_module_nowait.patch | 27 -------------------------- 1 file changed, 27 deletions(-) delete mode 100644 patches/63-request_module_nowait.patch diff --git a/patches/63-request_module_nowait.patch b/patches/63-request_module_nowait.patch deleted file mode 100644 index ae4bba7918a0..000000000000 --- a/patches/63-request_module_nowait.patch +++ /dev/null @@ -1,27 +0,0 @@ -request_module_nowait() was added on 2.6.30 but we can't -backport it. Under some circumstances though request_module_nowait() -likely was not meant to be used on purpose and instead we can -assume request_module() will work. This patch addresses the few -places where request_module_nowait() was used but that we can -at least somewhat assume that this can work. We do not backport -this into compat.git as a direct static inline given that there -are surely some places where request_module() cannot be used. - -All users of request_module_nowait() should revise their code and -snsure that is indeed what was meant. - ---- a/drivers/net/wireless/iwlwifi/iwl-drv.c -+++ b/drivers/net/wireless/iwlwifi/iwl-drv.c -@@ -910,7 +910,12 @@ static void iwl_ucode_callback(const str - if (!drv->op_mode) - goto out_unbind; - } else { -+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,30)) - request_module_nowait("%s", op->name); -+#else -+ /* Goes untested */ -+ request_module("%s", op->name); -+#endif - } - - /* -- 2.30.2