From: Mateusz Kulikowski Date: Sun, 19 Jul 2015 17:28:13 +0000 (+0200) Subject: staging: rtl8192e: Rename rtl8192_config_rate X-Git-Tag: firefly_0821_release~176^2~1221^2~429 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=122fe9f1dfa2aeacceda2d32a8e496168744c3de;p=firefly-linux-kernel-4.4.55.git staging: rtl8192e: Rename rtl8192_config_rate Use naming schema found in other rtlwifi devices. Rename rtl8192_config_rate to rtl92e_config_rate. Signed-off-by: Mateusz Kulikowski Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c b/drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c index 61b10694f4c7..a21da2f17774 100644 --- a/drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c +++ b/drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c @@ -968,7 +968,7 @@ static void rtl8192_net_update(struct net_device *dev) u16 rate_config = 0; net = &priv->rtllib->current_network; - rtl8192_config_rate(dev, &rate_config); + rtl92e_config_rate(dev, &rate_config); priv->dot11CurrentPreambleMode = PREAMBLE_AUTO; priv->basic_rate = rate_config &= 0x15f; write_nic_dword(dev, BSSIDR, ((u32 *)net->bssid)[0]); @@ -2151,7 +2151,7 @@ void rtl92e_update_ratr_table(struct net_device *dev) u16 rate_config = 0; u8 rate_index = 0; - rtl8192_config_rate(dev, &rate_config); + rtl92e_config_rate(dev, &rate_config); ratr_value = rate_config | *pMcsRate << 12; switch (ieee->mode) { case IEEE_A: diff --git a/drivers/staging/rtl8192e/rtl8192e/rtl_core.c b/drivers/staging/rtl8192e/rtl8192e/rtl_core.c index a6937aa84cf0..b13014a91f76 100644 --- a/drivers/staging/rtl8192e/rtl8192e/rtl_core.c +++ b/drivers/staging/rtl8192e/rtl8192e/rtl_core.c @@ -575,7 +575,7 @@ static void rtl8192_stop_beacon(struct net_device *dev) { } -void rtl8192_config_rate(struct net_device *dev, u16 *rate_config) +void rtl92e_config_rate(struct net_device *dev, u16 *rate_config) { struct r8192_priv *priv = rtllib_priv(dev); struct rtllib_network *net; diff --git a/drivers/staging/rtl8192e/rtl8192e/rtl_core.h b/drivers/staging/rtl8192e/rtl8192e/rtl_core.h index 65679846484c..fe70e39a6b4d 100644 --- a/drivers/staging/rtl8192e/rtl8192e/rtl_core.h +++ b/drivers/staging/rtl8192e/rtl8192e/rtl_core.h @@ -602,7 +602,7 @@ void rtl8192_irq_disable(struct net_device *dev); void rtl8192_pci_resetdescring(struct net_device *dev); void rtl8192_SetWirelessMode(struct net_device *dev, u8 wireless_mode); void rtl8192_irq_enable(struct net_device *dev); -void rtl8192_config_rate(struct net_device *dev, u16 *rate_config); +void rtl92e_config_rate(struct net_device *dev, u16 *rate_config); void rtl8192_irq_disable(struct net_device *dev); void rtl819x_UpdateRxPktTimeStamp(struct net_device *dev,