renegade-project/linux-next
2
0
Fork 0
mirror of https://github.com/edk2-porting/linux-next.git synced 2024-12-16 17:23:55 +08:00
Code

rtl8192e: Rename clashing symbols

Browse Source 
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: Sean MacLennan <seanm@seanm.ca>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
Sean MacLennan 2011-11-30 15:18:52 -05:00 committed by Greg Kroah-Hartman
parent a6707f830e
commit 976d534118
7 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/staging/rtl8192e/dot11d.c
View File

@ -46,7 +46,7 @@ static struct channel_list ChannelPlan[] = {
56, 60, 64}, 21} 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); struct rt_dot11d_info *pDot11dInfo = GET_DOT11D_INFO(ieee);
pDot11dInfo->bEnabled = false; pDot11dInfo->bEnabled = false;
@ -58,7 +58,7 @@ void Dot11d_Init(struct rtllib_device *ieee)
RESET_CIE_WATCHDOG(ieee); RESET_CIE_WATCHDOG(ieee);
} }
EXPORT_SYMBOL(Dot11d_Init); EXPORT_SYMBOL(dot11d_init);
void Dot11d_Channelmap(u8 channel_plan, struct rtllib_device *ieee) void Dot11d_Channelmap(u8 channel_plan, struct rtllib_device *ieee)
{ {

2
drivers/staging/rtl8192e/dot11d.h
View File

@ -93,7 +93,7 @@ static inline void cpMacAddr(unsigned char *des, unsigned char *src)
#define IS_DOT11D_STATE_DONE(__pIeeeDev) \ #define IS_DOT11D_STATE_DONE(__pIeeeDev) \
(GET_DOT11D_INFO(__pIeeeDev)->State == DOT11D_STATE_DONE) (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_Channelmap(u8 channel_plan, struct rtllib_device *ieee);
void Dot11d_Reset(struct rtllib_device *dev); void Dot11d_Reset(struct rtllib_device *dev);
void Dot11d_UpdateCountryIe(struct rtllib_device *dev, u8 *pTaddr, void Dot11d_UpdateCountryIe(struct rtllib_device *dev, u8 *pTaddr,

2
drivers/staging/rtl8192e/rtl8192e/r8192E_phy.c
View File

@ -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", RT_TRACE(COMP_TRACE, "====>%s()====stage:%d, step:%d, channel:%d\n",
__func__, *stage, *step, channel); __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", RT_TRACE(COMP_ERR, "=============>set to illegal channel:%d\n",
channel); channel);
return true; return true;

4
drivers/staging/rtl8192e/rtl8192e/rtl_core.c
View File

@ -579,7 +579,7 @@ static void rtl8192_update_beacon(void *data)
struct rtllib_network *net = &ieee->current_network; struct rtllib_network *net = &ieee->current_network;
if (ieee->pHTInfo->bCurrentHTSupport) if (ieee->pHTInfo->bCurrentHTSupport)
HTUpdateSelfAndPeerSetting(ieee, net); HT_update_self_and_peer_setting(ieee, net);
ieee->pHTInfo->bCurrentRT2RTLongSlotTime = ieee->pHTInfo->bCurrentRT2RTLongSlotTime =
net->bssht.bdRT2RTLongSlotTime; net->bssht.bdRT2RTLongSlotTime;
ieee->pHTInfo->RT2RT_HT_Mode = net->bssht.RT2RT_HT_Mode; 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; priv->ChannelPlan = COUNTRY_CODE_FCC;
} }
RT_TRACE(COMP_INIT, "Channel plan is %d\n", priv->ChannelPlan); 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); Dot11d_Channelmap(priv->ChannelPlan, priv->rtllib);
for (i = 1; i <= 11; i++) for (i = 1; i <= 11; i++)
(priv->rtllib->active_channel_map)[i] = 1; (priv->rtllib->active_channel_map)[i] = 1;

6
drivers/staging/rtl8192e/rtl819x_HTProc.c
View File

@ -943,8 +943,8 @@ 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 rtllib_network *pNetwork)
{ {
struct rt_hi_throughput *pHTInfo = ieee->pHTInfo; struct rt_hi_throughput *pHTInfo = ieee->pHTInfo;
struct ht_info_ele *pPeerHTInfo = struct ht_info_ele *pPeerHTInfo =
@ -955,7 +955,7 @@ void HTUpdateSelfAndPeerSetting(struct rtllib_device *ieee,
pHTInfo->CurrentOpMode = pPeerHTInfo->OptMode; pHTInfo->CurrentOpMode = pPeerHTInfo->OptMode;
} }
} }
EXPORT_SYMBOL(HTUpdateSelfAndPeerSetting); EXPORT_SYMBOL(HT_update_self_and_peer_setting);
void HTUseDefaultSetting(struct rtllib_device *ieee) void HTUseDefaultSetting(struct rtllib_device *ieee)
{ {

6
drivers/staging/rtl8192e/rtllib.h
View File

@ -2775,7 +2775,7 @@ extern void rtllib_rx_mgt(struct rtllib_device *ieee,
struct rtllib_rx_stats *stats); struct rtllib_rx_stats *stats);
extern void rtllib_rx_probe_rq(struct rtllib_device *ieee, extern void rtllib_rx_probe_rq(struct rtllib_device *ieee,
struct sk_buff *skb); struct sk_buff *skb);
extern int IsLegalChannel(struct rtllib_device *rtllib, u8 channel); extern int rtllib_legal_channel(struct rtllib_device *rtllib, u8 channel);
/* rtllib_wx.c */ /* rtllib_wx.c */
extern int rtllib_wx_get_scan(struct rtllib_device *ieee, extern int rtllib_wx_get_scan(struct rtllib_device *ieee,
@ -2972,8 +2972,8 @@ extern void HTInitializeHTInfo(struct rtllib_device *ieee);
extern void HTInitializeBssDesc(struct bss_ht *pBssHT); extern void HTInitializeBssDesc(struct bss_ht *pBssHT);
extern void HTResetSelfAndSavePeerSetting(struct rtllib_device *ieee, extern void HTResetSelfAndSavePeerSetting(struct rtllib_device *ieee,
struct rtllib_network *pNetwork); struct rtllib_network *pNetwork);
extern void HTUpdateSelfAndPeerSetting(struct rtllib_device *ieee, extern void HT_update_self_and_peer_setting(struct rtllib_device *ieee,
struct rtllib_network *pNetwork); struct rtllib_network *pNetwork);
extern u8 HTGetHighestMCSRate(struct rtllib_device *ieee, u8 *pMCSRateSet, extern u8 HTGetHighestMCSRate(struct rtllib_device *ieee, u8 *pMCSRateSet,
u8 *pMCSFilter); u8 *pMCSFilter);
extern u8 MCS_FILTER_ALL[]; extern u8 MCS_FILTER_ALL[];

6
drivers/staging/rtl8192e/rtllib_rx.c
View File

@ -2493,7 +2493,7 @@ static int IsPassiveChannel(struct rtllib_device *rtllib, u8 channel)
return 0; return 0;
} }
int IsLegalChannel(struct rtllib_device *rtllib, u8 channel) int rtllib_legal_channel(struct rtllib_device *rtllib, u8 channel)
{ {
if (MAX_CHANNEL_NUMBER < channel) { if (MAX_CHANNEL_NUMBER < channel) {
printk(KERN_INFO "%s(): Invalid Channel\n", __func__); printk(KERN_INFO "%s(): Invalid Channel\n", __func__);
@ -2504,7 +2504,7 @@ int IsLegalChannel(struct rtllib_device *rtllib, u8 channel)
return 0; return 0;
} }
EXPORT_SYMBOL(IsLegalChannel); EXPORT_SYMBOL(rtllib_legal_channel);
static inline void rtllib_process_probe_response( static inline void rtllib_process_probe_response(
struct rtllib_device *ieee, struct rtllib_device *ieee,
@ -2555,7 +2555,7 @@ static inline void rtllib_process_probe_response(
} }
if (!IsLegalChannel(ieee, network->channel)) if (!rtllib_legal_channel(ieee, network->channel))
goto free_network; goto free_network;
if (WLAN_FC_GET_STYPE(beacon->header.frame_ctl) == if (WLAN_FC_GET_STYPE(beacon->header.frame_ctl) ==