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

staging: rtl8192e: Rename constant IEEE_x to WIRELESS_MODE_x 



Rename constant IEEE_B to WIRELESS_MODE_B, IEEE_G -> WIRELESS_MODE_G and
IEEE_N_24G -> WIRELESS_MODE_N_24G to align with rtlwifi driver as
requested in TODO.

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


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

drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c

+5 −5
Original line number Diff line number Diff line
@@ -162,7 +162,7 @@ void rtl92e_set_reg(struct net_device *dev, u8 variable, u8 *val) 
			 &priv->rtllib->current_network.qos_data.parameters;



		u1bAIFS = qop->aifs[pAcParam] *

			  ((mode & (IEEE_G | IEEE_N_24G)) ? 9 : 20) + aSifsTime;

			  ((mode & (WIRELESS_MODE_G | WIRELESS_MODE_N_24G)) ? 9 : 20) + aSifsTime;



		rtl92e_dm_init_edca_turbo(dev);
@@ -1816,14 +1816,14 @@ void rtl92e_update_ratr_table(struct net_device *dev) 
	rtl92e_config_rate(dev, &rate_config);

	ratr_value = rate_config | *pMcsRate << 12;

	switch (ieee->mode) {

	case IEEE_B:

	case WIRELESS_MODE_B:

		ratr_value &= 0x0000000F;

		break;

	case IEEE_G:

	case IEEE_G | IEEE_B:

	case WIRELESS_MODE_G:

	case WIRELESS_MODE_G | WIRELESS_MODE_B:

		ratr_value &= 0x00000FF7;

		break;

	case IEEE_N_24G:

	case WIRELESS_MODE_N_24G:

		if (ieee->ht_info->peer_mimo_ps == 0)

			ratr_value &= 0x0007F007;

		else

drivers/staging/rtl8192e/rtl8192e/rtl_core.c

+1 −1
Original line number Diff line number Diff line
@@ -277,7 +277,7 @@ static void _rtl92e_update_cap(struct net_device *dev, u16 cap) 
		}

	}



	if (net->mode & (IEEE_G | IEEE_N_24G)) {

	if (net->mode & (WIRELESS_MODE_G | WIRELESS_MODE_N_24G)) {

		u8	slot_time_val;

		u8	cur_slot_time = priv->slot_time;

drivers/staging/rtl8192e/rtl8192e/rtl_dm.c

+1 −1
Original line number Diff line number Diff line
@@ -2104,7 +2104,7 @@ static void _rtl92e_dm_dynamic_tx_power(struct net_device *dev) 
		return;

	}

	if ((priv->rtllib->ht_info->IOTPeer == HT_IOT_PEER_ATHEROS) &&

	    (priv->rtllib->mode == IEEE_G)) {

	    (priv->rtllib->mode == WIRELESS_MODE_G)) {

		txhipower_threshold = TX_POWER_ATHEROAP_THRESH_HIGH;

		txlowpower_threshold = TX_POWER_ATHEROAP_THRESH_LOW;

	} else {

drivers/staging/rtl8192e/rtl819x_HTProc.c

+3 −3
Original line number Diff line number Diff line
@@ -424,12 +424,12 @@ static u8 HT_PickMCSRate(struct rtllib_device *ieee, u8 *pOperateMCS) 
	}



	switch (ieee->mode) {

	case IEEE_B:

	case IEEE_G:

	case WIRELESS_MODE_B:

	case WIRELESS_MODE_G:

		for (i = 0; i <= 15; i++)

			pOperateMCS[i] = 0;

		break;

	case IEEE_N_24G:

	case WIRELESS_MODE_N_24G:

		pOperateMCS[0] &= RATE_ADPT_1SS_MASK;

		pOperateMCS[1] &= RATE_ADPT_2SS_MASK;

		pOperateMCS[3] &= RATE_ADPT_MCS32_MASK;

drivers/staging/rtl8192e/rtllib.h

+2 −5
Original line number Diff line number Diff line
@@ -309,7 +309,7 @@ enum rt_op_mode { 
};



#define aSifsTime						\

	 ((priv->rtllib->current_network.mode == IEEE_N_24G) ? 16 : 10)

	 ((priv->rtllib->current_network.mode == WIRELESS_MODE_N_24G) ? 16 : 10)



#define MGMT_QUEUE_NUM 5
@@ -1722,10 +1722,7 @@ struct rtllib_device { 
	u8 priv[];

};



#define IEEE_B	    (1<<1)

#define IEEE_G	    (1<<2)

#define IEEE_N_24G		  (1<<4)

#define IEEE_MODE_MASK    (IEEE_B | IEEE_G)

#define IEEE_MODE_MASK    (WIRELESS_MODE_B | WIRELESS_MODE_G)



/* Generate a 802.11 header */