Commit d6128d77 authored by Philipp Hortmann's avatar Philipp Hortmann Committed by Greg Kroah-Hartman
Browse files

staging: rtl8192e: Remove variable modulation as it is constant 



ieee->modulation is initialized to 3 and then unchanged. All evaluations
will result accordingly. Remove resulting dead code.

Signed-off-by: default avatarPhilipp Hortmann <philipp.g.hortmann@gmail.com>
Link: https://lore.kernel.org/r/ebd543d097a65f105078c71faceaed2a4d5e7b55.1687583718.git.philipp.g.hortmann@gmail.com


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 70a49b83

drivers/staging/rtl8192e/rtl8192e/rtl_core.c

+0 −2
Original line number Diff line number Diff line
@@ -804,8 +804,6 @@ static void _rtl92e_init_priv_variable(struct net_device *dev) 
	priv->rtllib->iw_mode = IW_MODE_INFRA;

	priv->rtllib->active_scan = 1;

	priv->rtllib->be_scan_inprogress = false;

	priv->rtllib->modulation = RTLLIB_CCK_MODULATION |

				   RTLLIB_OFDM_MODULATION;

	priv->rtllib->host_encrypt = 1;

	priv->rtllib->host_decrypt = 1;

drivers/staging/rtl8192e/rtllib.h

+0 −1
Original line number Diff line number Diff line
@@ -1492,7 +1492,6 @@ struct rtllib_device { 


	int short_slot;

	int mode;       /* A, B, G */

	int modulation; /* CCK, OFDM */



	/* used for forcing the ibss workqueue to terminate

	 * without wait for the syncro scan to terminate

drivers/staging/rtl8192e/rtllib_softmac.c

+49 −72
Original line number Diff line number Diff line
@@ -35,11 +35,7 @@ static unsigned int rtllib_MFIE_rate_len(struct rtllib_device *ieee) 
{

	unsigned int rate_len = 0;



	if (ieee->modulation & RTLLIB_CCK_MODULATION)

	rate_len = RTLLIB_CCK_RATE_LEN + 2;



	if (ieee->modulation & RTLLIB_OFDM_MODULATION)



	rate_len += RTLLIB_OFDM_RATE_LEN + 2;



	return rate_len;
@@ -53,14 +49,12 @@ static void rtllib_MFIE_Brate(struct rtllib_device *ieee, u8 **tag_p) 
{

	u8 *tag = *tag_p;



	if (ieee->modulation & RTLLIB_CCK_MODULATION) {

	*tag++ = MFIE_TYPE_RATES;

	*tag++ = 4;

	*tag++ = RTLLIB_BASIC_RATE_MASK | RTLLIB_CCK_RATE_1MB;

	*tag++ = RTLLIB_BASIC_RATE_MASK | RTLLIB_CCK_RATE_2MB;

	*tag++ = RTLLIB_BASIC_RATE_MASK | RTLLIB_CCK_RATE_5MB;

	*tag++ = RTLLIB_BASIC_RATE_MASK | RTLLIB_CCK_RATE_11MB;

	}



	/* We may add an option for custom rates that specific HW

	 * might support
@@ -72,7 +66,6 @@ static void rtllib_MFIE_Grate(struct rtllib_device *ieee, u8 **tag_p) 
{

	u8 *tag = *tag_p;



	if (ieee->modulation & RTLLIB_OFDM_MODULATION) {

	*tag++ = MFIE_TYPE_RATES_EX;

	*tag++ = 8;

	*tag++ = RTLLIB_BASIC_RATE_MASK | RTLLIB_OFDM_RATE_6MB;
@@ -83,7 +76,7 @@ static void rtllib_MFIE_Grate(struct rtllib_device *ieee, u8 **tag_p) 
	*tag++ = RTLLIB_BASIC_RATE_MASK | RTLLIB_OFDM_RATE_36MB;

	*tag++ = RTLLIB_BASIC_RATE_MASK | RTLLIB_OFDM_RATE_48MB;

	*tag++ = RTLLIB_BASIC_RATE_MASK | RTLLIB_OFDM_RATE_54MB;

	}



	/* We may add an option for custom rates that specific HW might

	 * support

	 */
@@ -1465,8 +1458,7 @@ static void rtllib_associate_complete_wq(void *data) 


	netif_carrier_on(ieee->dev);

	ieee->is_roaming = false;

	if (rtllib_is_54g(&ieee->current_network) &&

	   (ieee->modulation & RTLLIB_OFDM_MODULATION)) {

	if (rtllib_is_54g(&ieee->current_network)) {

		ieee->rate = 108;

		netdev_info(ieee->dev, "Using G rates:%d\n", ieee->rate);

	} else {
@@ -1652,9 +1644,7 @@ inline void rtllib_softmac_new_net(struct rtllib_device *ieee, 
				schedule_delayed_work(

					   &ieee->associate_procedure_wq, 0);

			} else {

				if (rtllib_is_54g(&ieee->current_network) &&

				    (ieee->modulation &

				     RTLLIB_OFDM_MODULATION)) {

				if (rtllib_is_54g(&ieee->current_network)) {

					ieee->rate = 108;

					ieee->set_wireless_mode(ieee->dev, WIRELESS_MODE_G);

					netdev_info(ieee->dev,
@@ -2526,9 +2516,7 @@ static void rtllib_start_ibss_wq(void *data) 
		if (!ieee->wap_set)

			eth_random_addr(ieee->current_network.bssid);



		if (ieee->modulation & RTLLIB_CCK_MODULATION) {

		ieee->current_network.rates_len = 4;



		ieee->current_network.rates[0] =

			RTLLIB_BASIC_RATE_MASK | RTLLIB_CCK_RATE_1MB;

		ieee->current_network.rates[1] =
@@ -2538,13 +2526,7 @@ static void rtllib_start_ibss_wq(void *data) 
		ieee->current_network.rates[3] =

			RTLLIB_BASIC_RATE_MASK | RTLLIB_CCK_RATE_11MB;



		} else {

			ieee->current_network.rates_len = 0;

		}



		if (ieee->modulation & RTLLIB_OFDM_MODULATION) {

		ieee->current_network.rates_ex_len = 8;



		ieee->current_network.rates_ex[0] =

			RTLLIB_OFDM_RATE_6MB;

		ieee->current_network.rates_ex[1] =
@@ -2561,12 +2543,7 @@ static void rtllib_start_ibss_wq(void *data) 
			RTLLIB_OFDM_RATE_48MB;

		ieee->current_network.rates_ex[7] =

			RTLLIB_OFDM_RATE_54MB;



		ieee->rate = 108;

		} else {

			ieee->current_network.rates_ex_len = 0;

			ieee->rate = 22;

		}



		ieee->current_network.qos_data.supported = 0;

		ieee->set_wireless_mode(ieee->dev, WIRELESS_MODE_G);

drivers/staging/rtl8192e/rtllib_softmac_wx.c

+1 −3
Original line number Diff line number Diff line
@@ -487,11 +487,9 @@ EXPORT_SYMBOL(rtllib_wx_set_rawtx); 
int rtllib_wx_get_name(struct rtllib_device *ieee, struct iw_request_info *info,

		       union iwreq_data *wrqu, char *extra)

{

	const char *b = ieee->modulation & RTLLIB_CCK_MODULATION ? "b" : "";

	const char *g = ieee->modulation & RTLLIB_OFDM_MODULATION ? "g" : "";

	const char *n = ieee->mode & (WIRELESS_MODE_N_24G) ? "n" : "";



	scnprintf(wrqu->name, sizeof(wrqu->name), "802.11%s%s%s", b, g, n);

	scnprintf(wrqu->name, sizeof(wrqu->name), "802.11bg%s", n);

	return 0;

}

EXPORT_SYMBOL(rtllib_wx_get_name);