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

staging:rtl8192u: Rename Dot11d_UpdateCountryIe - Style 



The function Dot11d_UpdateCountryIe causes a checkpatch issue due to
its use of CamelCase naming, the function has been renamed to
dot11d_update_country_ie.

This is a coding style change which 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 6a184731

drivers/staging/rtl8192u/ieee80211/dot11d.c

+4 −4
Original line number Diff line number Diff line
@@ -49,7 +49,7 @@ EXPORT_SYMBOL(dot11d_reset); 
 * 1. IS_DOT11D_ENABLE() is TRUE.

 * 2. Input IE is an valid one.

 */

void Dot11d_UpdateCountryIe(struct ieee80211_device *dev, u8 *pTaddr,

void dot11d_update_country_ie(struct ieee80211_device *dev, u8 *pTaddr,

			    u16 CoutryIeLen, u8 *pCoutryIe)

{

	struct rt_dot11d_info *pDot11dInfo = GET_DOT11D_INFO(dev);
@@ -66,14 +66,14 @@ void Dot11d_UpdateCountryIe(struct ieee80211_device *dev, u8 *pTaddr, 
			/* It is not in a monotonically increasing order, so

			 * stop processing.

			 */

			netdev_err(dev->dev, "Dot11d_UpdateCountryIe(): Invalid country IE, skip it........1\n");

			netdev_err(dev->dev, "dot11d_update_country_ie(): Invalid country IE, skip it........1\n");

			return;

		}

		if (MAX_CHANNEL_NUMBER < (pTriple->first_channel + pTriple->num_channels)) {

			/* It is not a valid set of channel id, so stop

			 * processing.

			 */

			netdev_err(dev->dev, "Dot11d_UpdateCountryIe(): Invalid country IE, skip it........2\n");

			netdev_err(dev->dev, "dot11d_update_country_ie(): Invalid country IE, skip it........2\n");

			return;

		}
@@ -97,7 +97,7 @@ void Dot11d_UpdateCountryIe(struct ieee80211_device *dev, u8 *pTaddr, 
	memcpy(pDot11dInfo->country_ie_buf, pCoutryIe, CoutryIeLen);

	pDot11dInfo->state = DOT11D_STATE_LEARNED;

}

EXPORT_SYMBOL(Dot11d_UpdateCountryIe);

EXPORT_SYMBOL(dot11d_update_country_ie);



u8 DOT11D_GetMaxTxPwrInDbm(struct ieee80211_device *dev, u8 Channel)

{

drivers/staging/rtl8192u/ieee80211/dot11d.h

+4 −4
Original line number Diff line number Diff line
@@ -45,7 +45,7 @@ struct rt_dot11d_info { 


void dot11d_init(struct ieee80211_device *dev);

void dot11d_reset(struct ieee80211_device *dev);

void Dot11d_UpdateCountryIe(struct ieee80211_device *dev,

void dot11d_update_country_ie(struct ieee80211_device *dev,

			      u8 *pTaddr,

			      u16 CoutryIeLen,

			      u8 *pCoutryIe);

drivers/staging/rtl8192u/ieee80211/ieee80211_rx.c

+1 −1
Original line number Diff line number Diff line
@@ -1582,7 +1582,7 @@ static inline void ieee80211_extract_country_ie( 


			if (!IS_COUNTRY_IE_VALID(ieee))

			{

				Dot11d_UpdateCountryIe(ieee, addr2, info_element->len, info_element->data);

				dot11d_update_country_ie(ieee, addr2, info_element->len, info_element->data);

			}

		}