asgardius/android_kernel_motorola_sm6225
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

This is the 4.19.277 stable release

Browse source 
-----BEGIN PGP SIGNATURE-----
 
 iQIzBAABCAAdFiEEZH8oZUiU471FcZm+ONu9yGCSaT4FAmQO6jcACgkQONu9yGCS
 aT5LdBAAjZkEnKw/Lvwqn8cWeLkFNgbcYeKn3QPyBLjrKv4dEK33GQbJYyIBzcpB
 zdNyU8SNBGp+gKP6RqAjDizyun2v+uNuk05Bm9Nh0FfIqwogHa07nePKRCQzXtES
 WKQuTYAdnruhH+7lHu6l+m/ykzM26k5P/446lfbL8ulGhnBbmbo0smfk4q6/sMdx
 zsgE9didiqnKlyTvy/16sbqOcUM6KDyjNHzcvaLzgIumqxGu8FtXB4kj+O6+eHu8
 WSPDISX8/k1WzRQOOwF6HIdUm1EKi8GD9soUdAvq9G8GNO26qqFgfZdSKkJc9YVB
 QYz+y070089nRRaXL4agNXt29BTBKEnp9N/tsTL08LOOU79ESgb6sLqH1ZJITk5t
 W337prhyiE41CRZVBHwoSb2KUTr1KWkKLJ0Qy7RmlYXDdLM/3JC6V+vXIElazg67
 qkyAD7fekR20/wfZG3PeklOcN+XTMjeC8CAPA/jcFsxP8H0QRLMTEmJD8/LsT7cQ
 tmXvFkNTUY/uZDYvkWfQyFYeUBHGdqN1AOdn1PZ7fCMv3CMCBbomXpos31Z2WpV9
 9wmfCqq+8CtULTeJ5tIBrZQ63rS5fhGL2bPAF4MegX+RQFkjxyalZ19kCiXiVPvo
 UNykW7kRbTze5YtQXucR//hQKqFVQjA92PtGeZ0098W0dLh0wqM=
 =clG4
 -----END PGP SIGNATURE-----

Merge 4.19.277 into android-4.19-stable

Changes in 4.19.277
	wifi: cfg80211: Partial revert "wifi: cfg80211: Fix use after free for wext"
	staging: rtl8192e: Remove function ..dm_check_ac_dc_power calling a script
	staging: rtl8192e: Remove call_usermodehelper starting RadioPower.sh
	Linux 4.19.277

Change-Id: I98040d925011b4773cacd8cb0b74ca3f1670e270
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
This commit is contained in:
Greg Kroah-Hartman 2023-03-13 11:31:31 +00:00
commit 64e5437b84
3 changed files with 1 additions and 42 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Makefile
View file

@ -1,7 +1,7 @@
# SPDX-License-Identifier: GPL-2.0
VERSION = 4
PATCHLEVEL = 19
SUBLEVEL = 276
SUBLEVEL = 277
EXTRAVERSION =
NAME = "People's Front"

39
drivers/staging/rtl8192e/rtl8192e/rtl_dm.c
View file

@ -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(struct timer_list *t);
@ -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);
}
}

2
net/wireless/sme.c
View file

@ -1233,8 +1233,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;