From: Mateusz Kulikowski Date: Sun, 20 Sep 2015 08:19:41 +0000 (+0200) Subject: staging: rtl8192e: Rename dm_check_txrateandretrycount X-Git-Tag: firefly_0821_release~176^2~802^2~1552 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=0b230f92ba93076d7bdcf2ddc1b3b492c28e62f1;p=firefly-linux-kernel-4.4.55.git staging: rtl8192e: Rename dm_check_txrateandretrycount Use naming schema found in other rtlwifi devices. Rename dm_check_txrateandretrycount to _rtl92e_dm_check_txrateandretrycount. Signed-off-by: Mateusz Kulikowski Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/staging/rtl8192e/rtl8192e/rtl_dm.c b/drivers/staging/rtl8192e/rtl8192e/rtl_dm.c index 078b285e1ad3..c1b1e0c3a18b 100644 --- a/drivers/staging/rtl8192e/rtl8192e/rtl_dm.c +++ b/drivers/staging/rtl8192e/rtl8192e/rtl_dm.c @@ -202,7 +202,7 @@ static void dm_rxpath_sel_byrssi(struct net_device *dev); static void dm_init_fsync(struct net_device *dev); static void dm_deInit_fsync(struct net_device *dev); -static void dm_check_txrateandretrycount(struct net_device *dev); +static void _rtl92e_dm_check_txrateandretrycount(struct net_device *dev); static void _rtl92e_dm_check_ac_dc_power(struct net_device *dev); static void _rtl92e_dm_check_fsync(struct net_device *dev); static void _rtl92e_dm_check_rf_ctrl_gpio(void *data); @@ -260,7 +260,7 @@ void rtl92e_dm_watchdog(struct net_device *dev) _rtl92e_dm_check_ac_dc_power(dev); _rtl92e_dm_check_pbc_gpio(dev); - dm_check_txrateandretrycount(dev); + _rtl92e_dm_check_txrateandretrycount(dev); _rtl92e_dm_check_edca_turbo(dev); _rtl92e_dm_check_rate_adaptive(dev); @@ -2550,7 +2550,7 @@ static void dm_dynamic_txpower(struct net_device *dev) } -static void dm_check_txrateandretrycount(struct net_device *dev) +static void _rtl92e_dm_check_txrateandretrycount(struct net_device *dev) { struct r8192_priv *priv = rtllib_priv(dev); struct rtllib_device *ieee = priv->rtllib;