staging: rtl8192e: Rename dm_init_edca_turbo

Use naming schema found in other rtlwifi devices.
Rename dm_init_edca_turbo to rtl92e_dm_init_edca_turbo.

Signed-off-by: Mateusz Kulikowski <mateusz.kulikowski@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c b/drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c
index c7ffe9760c37cb5fe894f0d4aa96646e3d8f376b..8a8a1fd06503ffd949754fb5d5f74ffa75bf3a6a 100644 (file)
--- a/drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c
+++ b/drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c
@@ -193,7 +193,7 @@ void rtl92e_set_reg(struct net_device *dev, u8 variable, u8 *val)
                u1bAIFS = qop->aifs[pAcParam] *
                          ((mode&(IEEE_G|IEEE_N_24G)) ? 9 : 20) + aSifsTime;
 
-               dm_init_edca_turbo(dev);
+               rtl92e_dm_init_edca_turbo(dev);
 
                u4bAcParam = (le16_to_cpu(qop->tx_op_limit[pAcParam]) <<
                              AC_PARAM_TXOP_LIMIT_OFFSET) |

diff --git a/drivers/staging/rtl8192e/rtl8192e/rtl_core.c b/drivers/staging/rtl8192e/rtl8192e/rtl_core.c
index 04fe6dcbf2de10d361ab2de4881aec037ca6598d..ae8a82066f327ff772aff91429bd6c063f308688 100644 (file)
--- a/drivers/staging/rtl8192e/rtl8192e/rtl_core.c
+++ b/drivers/staging/rtl8192e/rtl8192e/rtl_core.c
@@ -525,7 +525,7 @@ static int rtl8192_qos_association_resp(struct r8192_priv *priv,
        RT_TRACE(COMP_QOS, "%s: network->flags = %d,%d\n", __func__,
                 network->flags, priv->rtllib->current_network.qos_data.active);
        if (set_qos_param == 1) {
-               dm_init_edca_turbo(priv->rtllib->dev);
+               rtl92e_dm_init_edca_turbo(priv->rtllib->dev);
                queue_work_rsl(priv->priv_wq, &priv->qos_activate);
        }
        return 0;

diff --git a/drivers/staging/rtl8192e/rtl8192e/rtl_dm.c b/drivers/staging/rtl8192e/rtl8192e/rtl_dm.c
index c947b62a17325a7d3426f67f93cdad389cd2ef5a..28e0d1f5fdc2aded1d6c218197bc22ba95152594 100644 (file)
--- a/drivers/staging/rtl8192e/rtl8192e/rtl_dm.c
+++ b/drivers/staging/rtl8192e/rtl8192e/rtl_dm.c
@@ -237,7 +237,7 @@ void init_hal_dm(struct net_device *dev)
        init_rate_adaptive(dev);
 
        dm_dig_init(dev);
-       dm_init_edca_turbo(dev);
+       rtl92e_dm_init_edca_turbo(dev);
        dm_init_bandwidth_autoswitch(dev);
        dm_init_fsync(dev);
        dm_init_rxpath_selection(dev);
@@ -1692,7 +1692,7 @@ static    void dm_cs_ratio(struct net_device *dev)
        }
 }
 
-void dm_init_edca_turbo(struct net_device *dev)
+void rtl92e_dm_init_edca_turbo(struct net_device *dev)
 {
        struct r8192_priv *priv = rtllib_priv(dev);
 

diff --git a/drivers/staging/rtl8192e/rtl8192e/rtl_dm.h b/drivers/staging/rtl8192e/rtl8192e/rtl_dm.h
index f7e74825c7166123826eb3c3aa4b85db7ec11fde..132b6dd6a9421ddcac03e16f7cafcf029589725c 100644 (file)
--- a/drivers/staging/rtl8192e/rtl8192e/rtl_dm.h
+++ b/drivers/staging/rtl8192e/rtl8192e/rtl_dm.h
@@ -201,7 +201,7 @@ extern  void rtl92e_dm_cck_txpower_adjust(struct net_device *dev, bool binch14);
 
 extern  void    dm_restore_dynamic_mechanism_state(struct net_device *dev);
 extern  void    rtl92e_dm_backup_state(struct net_device *dev);
-extern  void    dm_init_edca_turbo(struct net_device *dev);
+extern  void    rtl92e_dm_init_edca_turbo(struct net_device *dev);
 extern  void    dm_rf_pathcheck_workitemcallback(void *data);
 extern  void dm_initialize_txpower_tracking(struct net_device *dev);
 #endif /*__R8192UDM_H__ */