diff --git a/repos/dde_linux/patches/wifi.patch b/repos/dde_linux/patches/wifi.patch index eab187441..9d432bc94 100644 --- a/repos/dde_linux/patches/wifi.patch +++ b/repos/dde_linux/patches/wifi.patch @@ -333,3 +333,13 @@ index 9ee6bc1..02d740d 100644 scatterwalk_start(&walk, sg); scatterwalk_copychunks(buf, &walk, nbytes, out); +--- a/drivers/net/wireless/iwlwifi/iwl-drv.c ++++ b/drivers/net/wireless/iwlwifi/iwl-drv.c +@@ -1635,6 +1635,7 @@ + module_param_named(swcrypto, iwlwifi_mod_params.sw_crypto, int, S_IRUGO); + MODULE_PARM_DESC(swcrypto, "using crypto in software (default 0 [hardware])"); + module_param_named(11n_disable, iwlwifi_mod_params.disable_11n, uint, S_IRUGO); ++unsigned int *module_param_11n_disable = &iwlwifi_mod_params.disable_11n; + MODULE_PARM_DESC(11n_disable, + "disable 11n functionality, bitmap: 1: full, 2: disable agg TX, 4: disable agg RX, 8 enable agg TX"); + module_param_named(amsdu_size_8K, iwlwifi_mod_params.amsdu_size_8K, diff --git a/repos/dde_linux/ports/dde_linux.hash b/repos/dde_linux/ports/dde_linux.hash index 1efae2128..fb09d5c5b 100644 --- a/repos/dde_linux/ports/dde_linux.hash +++ b/repos/dde_linux/ports/dde_linux.hash @@ -1 +1 @@ -01af4e74fb2b25133f181d1b73d673b9683c330b +1652f5b16e4106d7f283c8bb31a8720891b0e05d diff --git a/repos/dde_linux/src/include/lx_emul/module.h b/repos/dde_linux/src/include/lx_emul/module.h index d8e4e9276..063273e85 100644 --- a/repos/dde_linux/src/include/lx_emul/module.h +++ b/repos/dde_linux/src/include/lx_emul/module.h @@ -64,14 +64,7 @@ int try_module_get(struct module *); *************************/ #define module_param(name, type, perm) - -/* - * For our shenanigans to work we have to define charp (used by the - * iwlwifi module). - */ -#define charp char* -#define module_param_named(name, value, type, perm) \ - type *module_param_ ## name = &value; +#define module_param_named(name, value, type, perm) #define module_param_unsafe(name, type, perm) #define module_param_named_unsafe(name, value, type, perm) diff --git a/repos/dde_linux/src/lib/usb/include/lx_emul.h b/repos/dde_linux/src/lib/usb/include/lx_emul.h index 0cd63a17f..090b99a48 100644 --- a/repos/dde_linux/src/lib/usb/include/lx_emul.h +++ b/repos/dde_linux/src/lib/usb/include/lx_emul.h @@ -509,8 +509,6 @@ int isprint(int); ** linux/moduleparam.h ** *************************/ -#define module_param(name, type, perm) -#define module_param_named(name, value, type, perm) #define module_param_array_named(name, array, type, nump, perm) #define module_param_string(name, string, len, perm) #define core_param(name, var, type, perm)