aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/staging/rtl8192u/r8192U_core.c
diff options
context:
space:
mode:
authorJohn Whitmore <johnfwhitmore@gmail.com>2018-09-04 11:56:23 +0100
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2018-09-10 10:21:37 +0200
commit9003987a08d4dd7bf9d2e5d3e332cc0b515812e4 (patch)
treecc3bac1b1dfac2f1d6c68d47411cad37011dbfaa /drivers/staging/rtl8192u/r8192U_core.c
parentstaging: fsl-dpaa2/ethsw: remove redundant pointer 'port_priv' (diff)
downloadlinux-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>
Diffstat (limited to 'drivers/staging/rtl8192u/r8192U_core.c')
-rw-r--r--drivers/staging/rtl8192u/r8192U_core.c2
1 files changed, 1 insertions, 1 deletions
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)) {