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

Commit 2aa608bc authored by John Whitmore's avatar John Whitmore Committed by Greg Kroah-Hartman
Browse files

staging:rtl8192u: Rename variable State > state - Style 



Rename the variable State to state, this clears the checkpatch issue
with CamelCase naming. The change is purely coding style and should
not impact runtime code execution.

Signed-off-by: default avatarJohn Whitmore <johnfwhitmore@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 6da23bfd

drivers/staging/rtl8192u/ieee80211/dot11d.c

+5 −5
Original line number Original line Diff line number Diff line
@@ -9,7 +9,7 @@ void Dot11d_Init(struct ieee80211_device *ieee) 




	pDot11dInfo->enabled = false;

	pDot11dInfo->enabled = false;





	pDot11dInfo->State = DOT11D_STATE_NONE;

	pDot11dInfo->state = DOT11D_STATE_NONE;

	pDot11dInfo->country_ie_len = 0;

	pDot11dInfo->country_ie_len = 0;

	memset(pDot11dInfo->channel_map, 0, MAX_CHANNEL_NUMBER + 1);

	memset(pDot11dInfo->channel_map, 0, MAX_CHANNEL_NUMBER + 1);

	memset(pDot11dInfo->max_tx_pwr_dbm_list, 0xFF, MAX_CHANNEL_NUMBER+1);

	memset(pDot11dInfo->max_tx_pwr_dbm_list, 0xFF, MAX_CHANNEL_NUMBER+1);
@@ -34,7 +34,7 @@ void Dot11d_Reset(struct ieee80211_device *ieee) 
	for (i = 12; i <= 14; i++)

	for (i = 12; i <= 14; i++)

		(pDot11dInfo->channel_map)[i] = 2;

		(pDot11dInfo->channel_map)[i] = 2;





	pDot11dInfo->State = DOT11D_STATE_NONE;

	pDot11dInfo->state = DOT11D_STATE_NONE;

	pDot11dInfo->country_ie_len = 0;

	pDot11dInfo->country_ie_len = 0;

	RESET_CIE_WATCHDOG(ieee);

	RESET_CIE_WATCHDOG(ieee);

}

}
@@ -95,7 +95,7 @@ void Dot11d_UpdateCountryIe(struct ieee80211_device *dev, u8 *pTaddr, 




	pDot11dInfo->country_ie_len = CoutryIeLen;

	pDot11dInfo->country_ie_len = CoutryIeLen;

	memcpy(pDot11dInfo->country_ie_buf, pCoutryIe, CoutryIeLen);

	memcpy(pDot11dInfo->country_ie_buf, pCoutryIe, CoutryIeLen);

	pDot11dInfo->State = DOT11D_STATE_LEARNED;

	pDot11dInfo->state = DOT11D_STATE_LEARNED;

}

}

EXPORT_SYMBOL(Dot11d_UpdateCountryIe);

EXPORT_SYMBOL(Dot11d_UpdateCountryIe);
@@ -119,9 +119,9 @@ void DOT11D_ScanComplete(struct ieee80211_device *dev) 
{

{

	struct rt_dot11d_info *pDot11dInfo = GET_DOT11D_INFO(dev);

	struct rt_dot11d_info *pDot11dInfo = GET_DOT11D_INFO(dev);





	switch (pDot11dInfo->State) {

	switch (pDot11dInfo->state) {

	case DOT11D_STATE_LEARNED:

	case DOT11D_STATE_LEARNED:

		pDot11dInfo->State = DOT11D_STATE_DONE;

		pDot11dInfo->state = DOT11D_STATE_DONE;

		break;

		break;





	case DOT11D_STATE_DONE:

	case DOT11D_STATE_DONE:

drivers/staging/rtl8192u/ieee80211/dot11d.h

+1 −1
Original line number Original line Diff line number Diff line
@@ -29,7 +29,7 @@ struct rt_dot11d_info { 
	u8  channel_map[MAX_CHANNEL_NUMBER+1];  /* !Value 0: Invalid, 1: Valid (active scan), 2: Valid (passive scan) */

	u8  channel_map[MAX_CHANNEL_NUMBER+1];  /* !Value 0: Invalid, 1: Valid (active scan), 2: Valid (passive scan) */

	u8  max_tx_pwr_dbm_list[MAX_CHANNEL_NUMBER+1];

	u8  max_tx_pwr_dbm_list[MAX_CHANNEL_NUMBER+1];





	enum dot11d_state State;

	enum dot11d_state state;

};

};





#define eqMacAddr(a, b)		(((a)[0] == (b)[0] &&		    \

#define eqMacAddr(a, b)		(((a)[0] == (b)[0] &&		    \