Commit 9003987a authored by John Whitmore's avatar John Whitmore Committed by Greg Kroah-Hartman

staging:rtl8192u: Rename dot11d_init to fix name clash

The function dot11d_init() was previously renamed to clear a style
issue. Unfortunately the new name used, dot11d_init(), clashes with
a sybmol which is exported with the same name. To correct this
problem the function has been renamed to rtl8192u_dot11d_init().
Reported-by: default avatarStephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: default avatarJohn Whitmore <johnfwhitmore@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent f8aefb7d
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
#include "dot11d.h" #include "dot11d.h"
void dot11d_init(struct ieee80211_device *ieee) void rtl8192u_dot11d_init(struct ieee80211_device *ieee)
{ {
struct rt_dot11d_info *pDot11dInfo = GET_DOT11D_INFO(ieee); struct rt_dot11d_info *pDot11dInfo = GET_DOT11D_INFO(ieee);
...@@ -15,9 +15,9 @@ void dot11d_init(struct ieee80211_device *ieee) ...@@ -15,9 +15,9 @@ void dot11d_init(struct ieee80211_device *ieee)
memset(pDot11dInfo->max_tx_pwr_dbm_list, 0xFF, MAX_CHANNEL_NUMBER+1); memset(pDot11dInfo->max_tx_pwr_dbm_list, 0xFF, MAX_CHANNEL_NUMBER+1);
RESET_CIE_WATCHDOG(ieee); RESET_CIE_WATCHDOG(ieee);
netdev_info(ieee->dev, "dot11d_init()\n"); netdev_info(ieee->dev, "rtl8192u_dot11d_init()\n");
} }
EXPORT_SYMBOL(dot11d_init); EXPORT_SYMBOL(rtl8192u_dot11d_init);
/* Reset to the state as we are just entering a regulatory domain. */ /* Reset to the state as we are just entering a regulatory domain. */
void dot11d_reset(struct ieee80211_device *ieee) void dot11d_reset(struct ieee80211_device *ieee)
......
...@@ -43,7 +43,7 @@ struct rt_dot11d_info { ...@@ -43,7 +43,7 @@ struct rt_dot11d_info {
#define RESET_CIE_WATCHDOG(ieee_dev) (GET_CIE_WATCHDOG(ieee_dev) = 0) #define RESET_CIE_WATCHDOG(ieee_dev) (GET_CIE_WATCHDOG(ieee_dev) = 0)
#define UPDATE_CIE_WATCHDOG(ieee_dev) (++GET_CIE_WATCHDOG(ieee_dev)) #define UPDATE_CIE_WATCHDOG(ieee_dev) (++GET_CIE_WATCHDOG(ieee_dev))
void dot11d_init(struct ieee80211_device *dev); void rtl8192u_dot11d_init(struct ieee80211_device *dev);
void dot11d_reset(struct ieee80211_device *dev); void dot11d_reset(struct ieee80211_device *dev);
void dot11d_update_country_ie(struct ieee80211_device *dev, void dot11d_update_country_ie(struct ieee80211_device *dev,
u8 *addr, u8 *addr,
......
...@@ -183,7 +183,7 @@ static void rtl819x_set_channel_map(u8 channel_plan, struct r8192_priv *priv) ...@@ -183,7 +183,7 @@ static void rtl819x_set_channel_map(u8 channel_plan, struct r8192_priv *priv)
case COUNTRY_CODE_ISRAEL: case COUNTRY_CODE_ISRAEL:
case COUNTRY_CODE_TELEC: case COUNTRY_CODE_TELEC:
case COUNTRY_CODE_MIC: case COUNTRY_CODE_MIC:
dot11d_init(ieee); rtl8192u_dot11d_init(ieee);
ieee->bGlobalDomain = false; ieee->bGlobalDomain = false;
/* actually 8225 & 8256 rf chips only support B,G,24N mode */ /* actually 8225 & 8256 rf chips only support B,G,24N mode */
if ((priv->rf_chip == RF_8225) || (priv->rf_chip == RF_8256)) { if ((priv->rf_chip == RF_8225) || (priv->rf_chip == RF_8256)) {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment