diff options
| -rw-r--r-- | 0000_README | 4 | ||||
| -rw-r--r-- | 1101_linux-5.15.102.patch | 104 |
2 files changed, 108 insertions, 0 deletions
diff --git a/0000_README b/0000_README index e7c4aeb3..26b5f619 100644 --- a/0000_README +++ b/0000_README @@ -447,6 +447,10 @@ Patch: 1100_linux-5.15.101.patch From: https://www.kernel.org Desc: Linux 5.15.101 +Patch: 1101_linux-5.15.102.patch +From: https://www.kernel.org +Desc: Linux 5.15.102 + 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/1101_linux-5.15.102.patch b/1101_linux-5.15.102.patch new file mode 100644 index 00000000..bc70ba47 --- /dev/null +++ b/1101_linux-5.15.102.patch @@ -0,0 +1,104 @@ +diff --git a/Makefile b/Makefile +index 2db3f373b81ea..a7b664680ea32 100644 +--- a/Makefile ++++ b/Makefile +@@ -1,7 +1,7 @@ + # SPDX-License-Identifier: GPL-2.0 + VERSION = 5 + PATCHLEVEL = 15 +-SUBLEVEL = 101 ++SUBLEVEL = 102 + EXTRAVERSION = + NAME = Trick or Treat + +diff --git a/drivers/staging/rtl8192e/rtl8192e/rtl_dm.c b/drivers/staging/rtl8192e/rtl8192e/rtl_dm.c +index 756d8db51937f..cd1c4f610159b 100644 +--- a/drivers/staging/rtl8192e/rtl8192e/rtl_dm.c ++++ b/drivers/staging/rtl8192e/rtl8192e/rtl_dm.c +@@ -185,7 +185,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(struct timer_list *t); +@@ -238,8 +237,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); + +@@ -257,30 +254,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 const char 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) + { + +@@ -1800,10 +1773,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 const char RadioPowerPath[] = "/etc/acpi/events/RadioPower.sh"; +- static char *envp[] = {"HOME=/", "TERM=linux", "PATH=/usr/bin:/bin", +- NULL}; + + bActuallySet = false; + +@@ -1835,14 +1804,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 6f386aecf6176..1591cd68fc583 100644 +--- a/net/wireless/sme.c ++++ b/net/wireless/sme.c +@@ -1263,8 +1263,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; |