commit: 888521b198da474138e19730d4edb0c4fbcf4340 Author: Alice Ferrazzi <alicef <AT> gentoo <DOT> org> AuthorDate: Mon Mar 13 10:46:32 2023 +0000 Commit: Alice Ferrazzi <alicef <AT> gentoo <DOT> org> CommitDate: Mon Mar 13 10:46:32 2023 +0000 URL: https://gitweb.gentoo.org/proj/linux-patches.git/commit/?id=888521b1
Linux patch 4.14.309 Signed-off-by: Alice Ferrazzi <alicef <AT> gentoo.org> 0000_README | 4 ++ 1308_linux-4.14.309.patch | 104 ++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 108 insertions(+) diff --git a/0000_README b/0000_README index a6c5e0ca..f28f3da3 100644 --- a/0000_README +++ b/0000_README @@ -1275,6 +1275,10 @@ Patch: 1307_linux-4.14.308.patch From: https://www.kernel.org Desc: Linux 4.14.308 +Patch: 1308_linux-4.14.309.patch +From: https://www.kernel.org +Desc: Linux 4.14.309 + Patch: 1500_XATTR_USER_PREFIX.patch From: https://bugs.gentoo.org/show_bug.cgi?id=470644 Desc: Support for namespace user.pax.* on tmpfs. diff --git a/1308_linux-4.14.309.patch b/1308_linux-4.14.309.patch new file mode 100644 index 00000000..31262963 --- /dev/null +++ b/1308_linux-4.14.309.patch @@ -0,0 +1,104 @@ +diff --git a/Makefile b/Makefile +index 4ea29fcd48eba..608adcd3f0634 100644 +--- a/Makefile ++++ b/Makefile +@@ -1,7 +1,7 @@ + # SPDX-License-Identifier: GPL-2.0 + VERSION = 4 + PATCHLEVEL = 14 +-SUBLEVEL = 308 ++SUBLEVEL = 309 + EXTRAVERSION = + NAME = Petit Gorille + +diff --git a/drivers/staging/rtl8192e/rtl8192e/rtl_dm.c b/drivers/staging/rtl8192e/rtl8192e/rtl_dm.c +index b8205ebafd721..d050dc646a5b7 100644 +--- a/drivers/staging/rtl8192e/rtl8192e/rtl_dm.c ++++ b/drivers/staging/rtl8192e/rtl8192e/rtl_dm.c +@@ -193,7 +193,6 @@ static void _rtl92e_dm_init_fsync(struct net_device *dev); + static void _rtl92e_dm_deinit_fsync(struct net_device *dev); + + static void _rtl92e_dm_check_txrateandretrycount(struct net_device *dev); +-static void _rtl92e_dm_check_ac_dc_power(struct net_device *dev); + static void _rtl92e_dm_check_fsync(struct net_device *dev); + static void _rtl92e_dm_check_rf_ctrl_gpio(void *data); + static void _rtl92e_dm_fsync_timer_callback(unsigned long data); +@@ -246,8 +245,6 @@ void rtl92e_dm_watchdog(struct net_device *dev) + if (priv->being_init_adapter) + return; + +- _rtl92e_dm_check_ac_dc_power(dev); +- + _rtl92e_dm_check_txrateandretrycount(dev); + _rtl92e_dm_check_edca_turbo(dev); + +@@ -265,30 +262,6 @@ void rtl92e_dm_watchdog(struct net_device *dev) + _rtl92e_dm_cts_to_self(dev); + } + +-static void _rtl92e_dm_check_ac_dc_power(struct net_device *dev) +-{ +- struct r8192_priv *priv = rtllib_priv(dev); +- static char const ac_dc_script[] = "/etc/acpi/wireless-rtl-ac-dc-power.sh"; +- char *argv[] = {(char *)ac_dc_script, DRV_NAME, NULL}; +- static char *envp[] = {"HOME=/", +- "TERM=linux", +- "PATH=/usr/bin:/bin", +- NULL}; +- +- if (priv->ResetProgress == RESET_TYPE_SILENT) { +- RT_TRACE((COMP_INIT | COMP_POWER | COMP_RF), +- "GPIOChangeRFWorkItemCallBack(): Silent Reset!!!!!!!\n"); +- return; +- } +- +- if (priv->rtllib->state != RTLLIB_LINKED) +- return; +- call_usermodehelper(ac_dc_script, argv, envp, UMH_WAIT_PROC); +- +- return; +-}; +- +- + void rtl92e_init_adaptive_rate(struct net_device *dev) + { + +@@ -1809,10 +1782,6 @@ static void _rtl92e_dm_check_rf_ctrl_gpio(void *data) + u8 tmp1byte; + enum rt_rf_power_state eRfPowerStateToSet; + bool bActuallySet = false; +- char *argv[3]; +- static char const RadioPowerPath[] = "/etc/acpi/events/RadioPower.sh"; +- static char *envp[] = {"HOME=/", "TERM=linux", "PATH=/usr/bin:/bin", +- NULL}; + + bActuallySet = false; + +@@ -1844,14 +1813,6 @@ static void _rtl92e_dm_check_rf_ctrl_gpio(void *data) + mdelay(1000); + priv->bHwRfOffAction = 1; + rtl92e_set_rf_state(dev, eRfPowerStateToSet, RF_CHANGE_BY_HW); +- if (priv->bHwRadioOff) +- argv[1] = "RFOFF"; +- else +- argv[1] = "RFON"; +- +- argv[0] = (char *)RadioPowerPath; +- argv[2] = NULL; +- call_usermodehelper(RadioPowerPath, argv, envp, UMH_WAIT_PROC); + } + } + +diff --git a/net/wireless/sme.c b/net/wireless/sme.c +index 4ae28d15e8ac3..be04e7396b36d 100644 +--- a/net/wireless/sme.c ++++ b/net/wireless/sme.c +@@ -1147,8 +1147,6 @@ int cfg80211_connect(struct cfg80211_registered_device *rdev, + connect->key = NULL; + connect->key_len = 0; + connect->key_idx = 0; +- connect->crypto.cipher_group = 0; +- connect->crypto.n_ciphers_pairwise = 0; + } + + wdev->connect_keys = connkeys;
