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

Commit 9e1c8eb6 authored by John Whitmore's avatar John Whitmore Committed by Greg Kroah-Hartman
Browse files

staging:rtl8192u: Rename CountryIeLen > country_ie_len - Style 



Rename CountryIeLen to country_ie_len, coding style change to clear
checkpatch issue with CamelCase naming. The change should have no
impact on runtime code execution.

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

drivers/staging/rtl8192u/ieee80211/dot11d.c

+3 −3
Original line number Diff line number Diff line
@@ -10,7 +10,7 @@ void Dot11d_Init(struct ieee80211_device *ieee) 
	pDot11dInfo->enabled = false;



	pDot11dInfo->State = DOT11D_STATE_NONE;

	pDot11dInfo->CountryIeLen = 0;

	pDot11dInfo->country_ie_len = 0;

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

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

	RESET_CIE_WATCHDOG(ieee);
@@ -35,7 +35,7 @@ void Dot11d_Reset(struct ieee80211_device *ieee) 
		(pDot11dInfo->channel_map)[i] = 2;



	pDot11dInfo->State = DOT11D_STATE_NONE;

	pDot11dInfo->CountryIeLen = 0;

	pDot11dInfo->country_ie_len = 0;

	RESET_CIE_WATCHDOG(ieee);

}

EXPORT_SYMBOL(Dot11d_Reset);
@@ -93,7 +93,7 @@ void Dot11d_UpdateCountryIe(struct ieee80211_device *dev, u8 *pTaddr, 


	UPDATE_CIE_SRC(dev, pTaddr);



	pDot11dInfo->CountryIeLen = CoutryIeLen;

	pDot11dInfo->country_ie_len = CoutryIeLen;

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

	pDot11dInfo->State = DOT11D_STATE_LEARNED;

}

drivers/staging/rtl8192u/ieee80211/dot11d.h

+3 −3
Original line number Diff line number Diff line
@@ -21,7 +21,7 @@ struct rt_dot11d_info { 


	bool enabled; /* dot11MultiDomainCapabilityEnabled */



	u16 CountryIeLen; /* > 0 if CountryIeBuf[] contains valid country information element. */

	u16 country_ie_len; /* > 0 if CountryIeBuf[] contains valid country information element. */

	u8  CountryIeBuf[MAX_IE_LEN];

	u8  CountryIeSrcAddr[6]; /* Source AP of the country IE. */

	u8  CountryIeWatchdog;
@@ -42,13 +42,13 @@ struct rt_dot11d_info { 
#define GET_DOT11D_INFO(__pIeeeDev) ((struct rt_dot11d_info *)((__pIeeeDev)->pDot11dInfo))



#define IS_DOT11D_ENABLE(__pIeeeDev) (GET_DOT11D_INFO(__pIeeeDev)->enabled)

#define IS_COUNTRY_IE_VALID(__pIeeeDev) (GET_DOT11D_INFO(__pIeeeDev)->CountryIeLen > 0)

#define IS_COUNTRY_IE_VALID(__pIeeeDev) (GET_DOT11D_INFO(__pIeeeDev)->country_ie_len > 0)



#define IS_EQUAL_CIE_SRC(__pIeeeDev, __pTa) eqMacAddr(GET_DOT11D_INFO(__pIeeeDev)->CountryIeSrcAddr, __pTa)

#define UPDATE_CIE_SRC(__pIeeeDev, __pTa) cpMacAddr(GET_DOT11D_INFO(__pIeeeDev)->CountryIeSrcAddr, __pTa)



#define IS_COUNTRY_IE_CHANGED(__pIeeeDev, __Ie) \

	(((__Ie).Length == 0 || (__Ie).Length != GET_DOT11D_INFO(__pIeeeDev)->CountryIeLen) ? \

	(((__Ie).Length == 0 || (__Ie).Length != GET_DOT11D_INFO(__pIeeeDev)->country_ie_len) ? \

	FALSE : \

	(!memcmp(GET_DOT11D_INFO(__pIeeeDev)->CountryIeBuf, (__Ie).Octet, (__Ie).Length)))