Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fd02046f authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Merge 5.4.236 into android11-5.4-lts 



Changes in 5.4.236
	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 5.4.236

Change-Id: Ife081f8967578d7826c788ae1e8e8b310cbcf6a5
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@google.com>
parents 48b83280 b829e8b6

Makefile

+1 −1
Original line number Original line Diff line number Diff line 
# SPDX-License-Identifier: GPL-2.0

# SPDX-License-Identifier: GPL-2.0

VERSION = 5

VERSION = 5

PATCHLEVEL = 4

PATCHLEVEL = 4

SUBLEVEL = 235

SUBLEVEL = 236

EXTRAVERSION =

EXTRAVERSION =

NAME = Kleptomaniac Octopus

NAME = Kleptomaniac Octopus

drivers/staging/rtl8192e/rtl8192e/rtl_dm.c

+0 −39
Original line number Original line Diff line number Diff line
@@ -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_deinit_fsync(struct net_device *dev);





static	void _rtl92e_dm_check_txrateandretrycount(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_fsync(struct net_device *dev);

static void _rtl92e_dm_check_rf_ctrl_gpio(void *data);

static void _rtl92e_dm_check_rf_ctrl_gpio(void *data);

static void _rtl92e_dm_fsync_timer_callback(struct timer_list *t);

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)

	if (priv->being_init_adapter)

		return;

		return;





	_rtl92e_dm_check_ac_dc_power(dev);



	_rtl92e_dm_check_txrateandretrycount(dev);

	_rtl92e_dm_check_txrateandretrycount(dev);

	_rtl92e_dm_check_edca_turbo(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);

	_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)

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;

	u8 tmp1byte;

	enum rt_rf_power_state eRfPowerStateToSet;

	enum rt_rf_power_state eRfPowerStateToSet;

	bool bActuallySet = false;

	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;

	bActuallySet = false;
@@ -1835,14 +1804,6 @@ static void _rtl92e_dm_check_rf_ctrl_gpio(void *data) 
		mdelay(1000);

		mdelay(1000);

		priv->bHwRfOffAction = 1;

		priv->bHwRfOffAction = 1;

		rtl92e_set_rf_state(dev, eRfPowerStateToSet, RF_CHANGE_BY_HW);

		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);

	}

	}

}

}

net/wireless/sme.c

+0 −2
Original line number Original line Diff line number Diff line
@@ -1259,8 +1259,6 @@ int cfg80211_connect(struct cfg80211_registered_device *rdev, 
		connect->key = NULL;

		connect->key = NULL;

		connect->key_len = 0;

		connect->key_len = 0;

		connect->key_idx = 0;

		connect->key_idx = 0;

		connect->crypto.cipher_group = 0;

		connect->crypto.n_ciphers_pairwise = 0;

	}

	}





	wdev->connect_keys = connkeys;

	wdev->connect_keys = connkeys;