diff options
| author |   John Whitmore <johnfwhitmore@gmail.com> | 2018-09-04 11:56:23 +0100 |
|---|---|---|
| committer |   Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2018-09-10 10:21:37 +0200 |
| commit | 9003987a08d4dd7bf9d2e5d3e332cc0b515812e4 (patch) | |
| tree | cc3bac1b1dfac2f1d6c68d47411cad37011dbfaa | |
| parent | staging: fsl-dpaa2/ethsw: remove redundant pointer 'port_priv' (diff) | |
| download | linux-dev-9003987a08d4dd7bf9d2e5d3e332cc0b515812e4.tar.xz linux-dev-9003987a08d4dd7bf9d2e5d3e332cc0b515812e4.zip | |
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: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: John Whitmore <johnfwhitmore@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -rw-r--r-- | drivers/staging/rtl8192u/ieee80211/dot11d.c | 6 | ||||
| -rw-r--r-- | drivers/staging/rtl8192u/ieee80211/dot11d.h | 2 | ||||
| -rw-r--r-- | drivers/staging/rtl8192u/r8192U_core.c | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/drivers/staging/rtl8192u/ieee80211/dot11d.c b/drivers/staging/rtl8192u/ieee80211/dot11d.c index d3b13f0cfc09..3c8e8ba999cf 100644 --- a/drivers/staging/rtl8192u/ieee80211/dot11d.c +++ b/drivers/staging/rtl8192u/ieee80211/dot11d.c @@ -3,7 +3,7 @@ #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); @@ -15,9 +15,9 @@ void dot11d_init(struct ieee80211_device *ieee) memset(pDot11dInfo->max_tx_pwr_dbm_list, 0xFF, MAX_CHANNEL_NUMBER+1); 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. */ void dot11d_reset(struct ieee80211_device *ieee) diff --git a/drivers/staging/rtl8192u/ieee80211/dot11d.h b/drivers/staging/rtl8192u/ieee80211/dot11d.h index be59f720ae20..d217eb8063c4 100644 --- a/drivers/staging/rtl8192u/ieee80211/dot11d.h +++ b/drivers/staging/rtl8192u/ieee80211/dot11d.h @@ -43,7 +43,7 @@ struct rt_dot11d_info { #define RESET_CIE_WATCHDOG(ieee_dev) (GET_CIE_WATCHDOG(ieee_dev) = 0) #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_update_country_ie(struct ieee80211_device *dev, u8 *addr, diff --git a/drivers/staging/rtl8192u/r8192U_core.c b/drivers/staging/rtl8192u/r8192U_core.c index 6b22aaa40ff9..0a21a76dcbc3 100644 --- a/drivers/staging/rtl8192u/r8192U_core.c +++ b/drivers/staging/rtl8192u/r8192U_core.c @@ -183,7 +183,7 @@ static void rtl819x_set_channel_map(u8 channel_plan, struct r8192_priv *priv) case COUNTRY_CODE_ISRAEL: case COUNTRY_CODE_TELEC: case COUNTRY_CODE_MIC: - dot11d_init(ieee); + rtl8192u_dot11d_init(ieee); ieee->bGlobalDomain = false; /* actually 8225 & 8256 rf chips only support B,G,24N mode */ if ((priv->rf_chip == RF_8225) || (priv->rf_chip == RF_8256)) { |