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

Commit 976d5341 authored by Sean MacLennan's avatar Sean MacLennan Committed by Greg Kroah-Hartman
Browse files

rtl8192e: Rename clashing symbols 



The "rtl8192e: Export symbols" patch exported three functions already
exported by the rtl8192u driver. This patch renames the three functions:
  Dot11d_Init => dot11d_init
  HTUpdateSelfAndPeerSetting => HT_update_self_and_peer_setting
  IsLegalChannel => rtllib_legal_channel

Signed-off-by: default avatarSean MacLennan <seanm@seanm.ca>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent a6707f83

drivers/staging/rtl8192e/dot11d.c

+2 −2
Original line number Diff line number Diff line
@@ -46,7 +46,7 @@ static struct channel_list ChannelPlan[] = { 
	  56, 60, 64}, 21}

};



void Dot11d_Init(struct rtllib_device *ieee)

void dot11d_init(struct rtllib_device *ieee)

{

	struct rt_dot11d_info *pDot11dInfo = GET_DOT11D_INFO(ieee);

	pDot11dInfo->bEnabled = false;
@@ -58,7 +58,7 @@ void Dot11d_Init(struct rtllib_device *ieee) 
	RESET_CIE_WATCHDOG(ieee);



}

EXPORT_SYMBOL(Dot11d_Init);

EXPORT_SYMBOL(dot11d_init);



void Dot11d_Channelmap(u8 channel_plan, struct rtllib_device *ieee)

{

drivers/staging/rtl8192e/dot11d.h

+1 −1
Original line number Diff line number Diff line
@@ -93,7 +93,7 @@ static inline void cpMacAddr(unsigned char *des, unsigned char *src) 
#define IS_DOT11D_STATE_DONE(__pIeeeDev)			\

	(GET_DOT11D_INFO(__pIeeeDev)->State == DOT11D_STATE_DONE)



void Dot11d_Init(struct rtllib_device *dev);

void dot11d_init(struct rtllib_device *dev);

void Dot11d_Channelmap(u8 channel_plan, struct rtllib_device *ieee);

void Dot11d_Reset(struct rtllib_device *dev);

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

drivers/staging/rtl8192e/rtl8192e/r8192E_phy.c

+1 −1
Original line number Diff line number Diff line
@@ -858,7 +858,7 @@ static u8 rtl8192_phy_SwChnlStepByStep(struct net_device *dev, u8 channel, 
	RT_TRACE(COMP_TRACE, "====>%s()====stage:%d, step:%d, channel:%d\n",

		  __func__, *stage, *step, channel);



	if (!IsLegalChannel(priv->rtllib, channel)) {

	if (!rtllib_legal_channel(priv->rtllib, channel)) {

		RT_TRACE(COMP_ERR, "=============>set to illegal channel:%d\n",

			 channel);

		return true;

drivers/staging/rtl8192e/rtl8192e/rtl_core.c

+2 −2
Original line number Diff line number Diff line
@@ -579,7 +579,7 @@ static void rtl8192_update_beacon(void *data) 
	struct rtllib_network *net = &ieee->current_network;



	if (ieee->pHTInfo->bCurrentHTSupport)

		HTUpdateSelfAndPeerSetting(ieee, net);

		HT_update_self_and_peer_setting(ieee, net);

	ieee->pHTInfo->bCurrentRT2RTLongSlotTime =

		 net->bssht.bdRT2RTLongSlotTime;

	ieee->pHTInfo->RT2RT_HT_Mode = net->bssht.RT2RT_HT_Mode;
@@ -1287,7 +1287,7 @@ static short rtl8192_get_channel_map(struct net_device *dev) 
		priv->ChannelPlan = COUNTRY_CODE_FCC;

	}

	RT_TRACE(COMP_INIT, "Channel plan is %d\n", priv->ChannelPlan);

	Dot11d_Init(priv->rtllib);

	dot11d_init(priv->rtllib);

	Dot11d_Channelmap(priv->ChannelPlan, priv->rtllib);

	for (i = 1; i <= 11; i++)

		(priv->rtllib->active_channel_map)[i] = 1;

drivers/staging/rtl8192e/rtl819x_HTProc.c

+3 −3
Original line number Diff line number Diff line
@@ -943,7 +943,7 @@ void HTResetSelfAndSavePeerSetting(struct rtllib_device *ieee, 
	}

}



void HTUpdateSelfAndPeerSetting(struct rtllib_device *ieee,

void HT_update_self_and_peer_setting(struct rtllib_device *ieee,

				     struct rtllib_network *pNetwork)

{

	struct rt_hi_throughput *pHTInfo = ieee->pHTInfo;
@@ -955,7 +955,7 @@ void HTUpdateSelfAndPeerSetting(struct rtllib_device *ieee, 
			pHTInfo->CurrentOpMode = pPeerHTInfo->OptMode;

	}

}

EXPORT_SYMBOL(HTUpdateSelfAndPeerSetting);

EXPORT_SYMBOL(HT_update_self_and_peer_setting);



void HTUseDefaultSetting(struct rtllib_device *ieee)

{