These changes are the raw update to linux-4.4.6-rt14. Kernel sources
[kvmfornfv.git] / kernel / drivers / staging / rtl8192e / rtl8192e / rtl_core.c
index 352d381..8f989a9 100644 (file)
  * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
  * more details.
  *
- * You should have received a copy of the GNU General Public License along with
- * this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA
- *
  * The full GNU General Public License is included in this distribution in the
  * file called LICENSE.
  *
  * Contact Information:
  * wlanfae <wlanfae@realtek.com>
 ******************************************************************************/
-#undef RX_DONT_PASS_UL
-#undef DEBUG_EPROM
-#undef DEBUG_RX_VERBOSE
-#undef DUMMY_RX
-#undef DEBUG_ZERO_RX
-#undef DEBUG_RX_SKB
-#undef DEBUG_TX_FRAG
-#undef DEBUG_RX_FRAG
-#undef DEBUG_TX_FILLDESC
-#undef DEBUG_TX
-#undef DEBUG_IRQ
-#undef DEBUG_RX
-#undef DEBUG_RXALLOC
-#undef DEBUG_REGISTERS
-#undef DEBUG_RING
-#undef DEBUG_IRQ_TASKLET
-#undef DEBUG_TX_ALLOC
-#undef DEBUG_TX_DESC
-
 #include <linux/uaccess.h>
 #include <linux/pci.h>
 #include <linux/vmalloc.h>
+#include <linux/ieee80211.h>
 #include "rtl_core.h"
 #include "r8192E_phy.h"
 #include "r8192E_phyreg.h"
@@ -62,24 +40,24 @@ static char *ifname = "wlan%d";
 
 static struct rtl819x_ops rtl819xp_ops = {
        .nic_type                       = NIC_8192E,
-       .get_eeprom_size                = rtl8192_get_eeprom_size,
-       .init_adapter_variable          = rtl8192_InitializeVariables,
-       .initialize_adapter             = rtl8192_adapter_start,
-       .link_change                    = rtl8192_link_change,
-       .tx_fill_descriptor             = rtl8192_tx_fill_desc,
-       .tx_fill_cmd_descriptor         = rtl8192_tx_fill_cmd_desc,
-       .rx_query_status_descriptor     = rtl8192_rx_query_status_desc,
+       .get_eeprom_size                = rtl92e_get_eeprom_size,
+       .init_adapter_variable          = rtl92e_init_variables,
+       .initialize_adapter             = rtl92e_start_adapter,
+       .link_change                    = rtl92e_link_change,
+       .tx_fill_descriptor             = rtl92e_fill_tx_desc,
+       .tx_fill_cmd_descriptor         = rtl92e_fill_tx_cmd_desc,
+       .rx_query_status_descriptor     = rtl92e_get_rx_stats,
        .rx_command_packet_handler = NULL,
-       .stop_adapter                   = rtl8192_halt_adapter,
-       .update_ratr_table              = rtl8192_update_ratr_table,
-       .irq_enable                     = rtl8192_EnableInterrupt,
-       .irq_disable                    = rtl8192_DisableInterrupt,
-       .irq_clear                      = rtl8192_ClearInterrupt,
-       .rx_enable                      = rtl8192_enable_rx,
-       .tx_enable                      = rtl8192_enable_tx,
-       .interrupt_recognized           = rtl8192_interrupt_recognized,
-       .TxCheckStuckHandler            = rtl8192_HalTxCheckStuck,
-       .RxCheckStuckHandler            = rtl8192_HalRxCheckStuck,
+       .stop_adapter                   = rtl92e_stop_adapter,
+       .update_ratr_table              = rtl92e_update_ratr_table,
+       .irq_enable                     = rtl92e_enable_irq,
+       .irq_disable                    = rtl92e_disable_irq,
+       .irq_clear                      = rtl92e_clear_irq,
+       .rx_enable                      = rtl92e_enable_rx,
+       .tx_enable                      = rtl92e_enable_tx,
+       .interrupt_recognized           = rtl92e_ack_irq,
+       .TxCheckStuckHandler            = rtl92e_is_tx_stuck,
+       .RxCheckStuckHandler            = rtl92e_is_rx_stuck,
 };
 
 static struct pci_device_id rtl8192_pci_id_tbl[] = {
@@ -91,212 +69,71 @@ static struct pci_device_id rtl8192_pci_id_tbl[] = {
 
 MODULE_DEVICE_TABLE(pci, rtl8192_pci_id_tbl);
 
-static int rtl8192_pci_probe(struct pci_dev *pdev,
-                       const struct pci_device_id *id);
-static void rtl8192_pci_disconnect(struct pci_dev *pdev);
-static irqreturn_t rtl8192_interrupt(int irq, void *netdev);
+static int _rtl92e_pci_probe(struct pci_dev *pdev,
+                            const struct pci_device_id *id);
+static void _rtl92e_pci_disconnect(struct pci_dev *pdev);
+static irqreturn_t _rtl92e_irq(int irq, void *netdev);
 
 static struct pci_driver rtl8192_pci_driver = {
        .name = DRV_NAME,       /* Driver name   */
        .id_table = rtl8192_pci_id_tbl, /* PCI_ID table  */
-       .probe  = rtl8192_pci_probe,    /* probe fn      */
-       .remove  = rtl8192_pci_disconnect,      /* remove fn */
-       .suspend = rtl8192E_suspend,    /* PM suspend fn */
-       .resume = rtl8192E_resume,                 /* PM resume fn  */
+       .probe  = _rtl92e_pci_probe,    /* probe fn      */
+       .remove  = _rtl92e_pci_disconnect,      /* remove fn */
+       .suspend = rtl92e_suspend,      /* PM suspend fn */
+       .resume = rtl92e_resume,                 /* PM resume fn  */
 };
 
+static short _rtl92e_is_tx_queue_empty(struct net_device *dev);
+static void _rtl92e_watchdog_wq_cb(void *data);
+static void _rtl92e_watchdog_timer_cb(unsigned long data);
+static void _rtl92e_hard_data_xmit(struct sk_buff *skb, struct net_device *dev,
+                                  int rate);
+static int _rtl92e_hard_start_xmit(struct sk_buff *skb, struct net_device *dev);
+static void _rtl92e_tx_cmd(struct net_device *dev, struct sk_buff *skb);
+static short _rtl92e_tx(struct net_device *dev, struct sk_buff *skb);
+static short _rtl92e_pci_initdescring(struct net_device *dev);
+static void _rtl92e_irq_tx_tasklet(struct r8192_priv *priv);
+static void _rtl92e_irq_rx_tasklet(struct r8192_priv *priv);
+static void _rtl92e_cancel_deferred_work(struct r8192_priv *priv);
+static int _rtl92e_up(struct net_device *dev, bool is_silent_reset);
+static int _rtl92e_try_up(struct net_device *dev);
+static int _rtl92e_down(struct net_device *dev, bool shutdownrf);
+static void _rtl92e_restart(void *data);
+
 /****************************************************************************
    -----------------------------IO STUFF-------------------------
 *****************************************************************************/
-static bool PlatformIOCheckPageLegalAndGetRegMask(u32 u4bPage, u8 *pu1bPageMask)
-{
-       bool            bReturn = false;
-
-       *pu1bPageMask = 0xfe;
-
-       switch (u4bPage) {
-       case 1: case 2: case 3: case 4:
-       case 8: case 9: case 10: case 12: case 13:
-               bReturn = true;
-               *pu1bPageMask = 0xf0;
-               break;
-
-       default:
-               bReturn = false;
-               break;
-       }
-
-       return bReturn;
-}
-
-void write_nic_io_byte(struct net_device *dev, int x, u8 y)
-{
-       u32 u4bPage = x >> 8;
-       u8 u1PageMask = 0;
-       bool    bIsLegalPage = false;
-
-       if (u4bPage == 0) {
-               outb(y&0xff, dev->base_addr + x);
-
-       } else {
-               bIsLegalPage = PlatformIOCheckPageLegalAndGetRegMask(u4bPage,
-                              &u1PageMask);
-               if (bIsLegalPage) {
-                       u8 u1bPsr = read_nic_io_byte(dev, PSR);
-
-                       write_nic_io_byte(dev, PSR, ((u1bPsr & u1PageMask) |
-                                         (u8)u4bPage));
-                       write_nic_io_byte(dev, (x & 0xff), y);
-                       write_nic_io_byte(dev, PSR, (u1bPsr & u1PageMask));
-               }
-       }
-}
-
-void write_nic_io_word(struct net_device *dev, int x, u16 y)
-{
-       u32 u4bPage = x >> 8;
-       u8 u1PageMask = 0;
-       bool    bIsLegalPage = false;
-
-       if (u4bPage == 0) {
-               outw(y, dev->base_addr + x);
-       } else {
-               bIsLegalPage = PlatformIOCheckPageLegalAndGetRegMask(u4bPage,
-                                                        &u1PageMask);
-               if (bIsLegalPage) {
-                       u8 u1bPsr = read_nic_io_byte(dev, PSR);
-
-                       write_nic_io_byte(dev, PSR, ((u1bPsr & u1PageMask) |
-                                         (u8)u4bPage));
-                       write_nic_io_word(dev, (x & 0xff), y);
-                       write_nic_io_byte(dev, PSR, (u1bPsr & u1PageMask));
-
-               }
-       }
-}
 
-void write_nic_io_dword(struct net_device *dev, int x, u32 y)
-{
-       u32 u4bPage = x >> 8;
-       u8 u1PageMask = 0;
-       bool    bIsLegalPage = false;
-
-       if (u4bPage == 0) {
-               outl(y, dev->base_addr + x);
-       } else {
-               bIsLegalPage = PlatformIOCheckPageLegalAndGetRegMask(u4bPage,
-                                                &u1PageMask);
-               if (bIsLegalPage) {
-                       u8 u1bPsr = read_nic_io_byte(dev, PSR);
-
-                       write_nic_io_byte(dev, PSR, ((u1bPsr & u1PageMask) |
-                                         (u8)u4bPage));
-                       write_nic_io_dword(dev, (x & 0xff), y);
-                       write_nic_io_byte(dev, PSR, (u1bPsr & u1PageMask));
-               }
-       }
-}
-
-u8 read_nic_io_byte(struct net_device *dev, int x)
-{
-       u32 u4bPage = x >> 8;
-       u8 u1PageMask = 0;
-       bool    bIsLegalPage = false;
-       u8      Data = 0;
-
-       if (u4bPage == 0)
-               return 0xff&inb(dev->base_addr + x);
-
-       bIsLegalPage = PlatformIOCheckPageLegalAndGetRegMask(u4bPage,
-                                                            &u1PageMask);
-       if (bIsLegalPage) {
-               u8 u1bPsr = read_nic_io_byte(dev, PSR);
-
-               write_nic_io_byte(dev, PSR, ((u1bPsr & u1PageMask) |
-                                 (u8)u4bPage));
-               Data = read_nic_io_byte(dev, (x & 0xff));
-               write_nic_io_byte(dev, PSR, (u1bPsr & u1PageMask));
-       }
-
-       return Data;
-}
-
-u16 read_nic_io_word(struct net_device *dev, int x)
-{
-       u32 u4bPage = x >> 8;
-       u8 u1PageMask = 0;
-       bool    bIsLegalPage = false;
-       u16     Data = 0;
-
-       if (u4bPage == 0)
-               return inw(dev->base_addr + x);
-       bIsLegalPage = PlatformIOCheckPageLegalAndGetRegMask(u4bPage,
-                                                            &u1PageMask);
-       if (bIsLegalPage) {
-               u8 u1bPsr = read_nic_io_byte(dev, PSR);
-
-               write_nic_io_byte(dev, PSR, ((u1bPsr & u1PageMask) |
-                                 (u8)u4bPage));
-               Data = read_nic_io_word(dev, (x & 0xff));
-               write_nic_io_byte(dev, PSR, (u1bPsr & u1PageMask));
-       }
-
-       return Data;
-}
-
-u32 read_nic_io_dword(struct net_device *dev, int x)
-{
-       u32 u4bPage = x >> 8;
-       u8 u1PageMask = 0;
-       bool    bIsLegalPage = false;
-       u32     Data = 0;
-
-       if (u4bPage == 0)
-               return inl(dev->base_addr + x);
-       bIsLegalPage = PlatformIOCheckPageLegalAndGetRegMask(u4bPage,
-                      &u1PageMask);
-       if (bIsLegalPage) {
-               u8 u1bPsr = read_nic_io_byte(dev, PSR);
-
-               write_nic_io_byte(dev, PSR, ((u1bPsr & u1PageMask) |
-                                 (u8)u4bPage));
-               Data = read_nic_io_dword(dev, (x & 0xff));
-               write_nic_io_byte(dev, PSR, (u1bPsr & u1PageMask));
-       }
-
-       return Data;
-}
-
-u8 read_nic_byte(struct net_device *dev, int x)
+u8 rtl92e_readb(struct net_device *dev, int x)
 {
        return 0xff & readb((u8 __iomem *)dev->mem_start + x);
 }
 
-u32 read_nic_dword(struct net_device *dev, int x)
+u32 rtl92e_readl(struct net_device *dev, int x)
 {
        return readl((u8 __iomem *)dev->mem_start + x);
 }
 
-u16 read_nic_word(struct net_device *dev, int x)
+u16 rtl92e_readw(struct net_device *dev, int x)
 {
        return readw((u8 __iomem *)dev->mem_start + x);
 }
 
-void write_nic_byte(struct net_device *dev, int x, u8 y)
+void rtl92e_writeb(struct net_device *dev, int x, u8 y)
 {
        writeb(y, (u8 __iomem *)dev->mem_start + x);
 
        udelay(20);
 }
 
-void write_nic_dword(struct net_device *dev, int x, u32 y)
+void rtl92e_writel(struct net_device *dev, int x, u32 y)
 {
        writel(y, (u8 __iomem *)dev->mem_start + x);
 
        udelay(20);
 }
 
-void write_nic_word(struct net_device *dev, int x, u16 y)
+void rtl92e_writew(struct net_device *dev, int x, u16 y)
 {
        writew(y, (u8 __iomem *)dev->mem_start + x);
 
@@ -306,10 +143,9 @@ void write_nic_word(struct net_device *dev, int x, u16 y)
 /****************************************************************************
    -----------------------------GENERAL FUNCTION-------------------------
 *****************************************************************************/
-bool MgntActSet_RF_State(struct net_device *dev,
+bool rtl92e_set_rf_state(struct net_device *dev,
                         enum rt_rf_power_state StateToSet,
-                        RT_RF_CHANGE_SOURCE ChangeSource,
-                        bool   ProtectOrNot)
+                        RT_RF_CHANGE_SOURCE ChangeSource)
 {
        struct r8192_priv *priv = rtllib_priv(dev);
        struct rtllib_device *ieee = priv->rtllib;
@@ -320,38 +156,34 @@ bool MgntActSet_RF_State(struct net_device *dev,
        unsigned long flag;
 
        RT_TRACE((COMP_PS | COMP_RF),
-                "===>MgntActSet_RF_State(): StateToSet(%d)\n", StateToSet);
-
-       ProtectOrNot = false;
+                "===>rtl92e_set_rf_state(): StateToSet(%d)\n", StateToSet);
 
+       while (true) {
+               spin_lock_irqsave(&priv->rf_ps_lock, flag);
+               if (priv->RFChangeInProgress) {
+                       spin_unlock_irqrestore(&priv->rf_ps_lock, flag);
+                       RT_TRACE((COMP_PS | COMP_RF),
+                                "rtl92e_set_rf_state(): RF Change in progress! Wait to set..StateToSet(%d).\n",
+                                StateToSet);
 
-       if (!ProtectOrNot) {
-               while (true) {
-                       spin_lock_irqsave(&priv->rf_ps_lock, flag);
-                       if (priv->RFChangeInProgress) {
-                               spin_unlock_irqrestore(&priv->rf_ps_lock, flag);
+                       while (priv->RFChangeInProgress) {
+                               RFWaitCounter++;
                                RT_TRACE((COMP_PS | COMP_RF),
-                                        "MgntActSet_RF_State(): RF Change in progress! Wait to set..StateToSet(%d).\n",
-                                        StateToSet);
-
-                               while (priv->RFChangeInProgress) {
-                                       RFWaitCounter++;
-                                       RT_TRACE((COMP_PS | COMP_RF),
-                                                "MgntActSet_RF_State(): Wait 1 ms (%d times)...\n",
-                                                RFWaitCounter);
-                                       mdelay(1);
-
-                                       if (RFWaitCounter > 100) {
-                                               RT_TRACE(COMP_ERR,
-                                                        "MgntActSet_RF_State(): Wait too logn to set RF\n");
-                                               return false;
-                                       }
+                                        "rtl92e_set_rf_state(): Wait 1 ms (%d times)...\n",
+                                        RFWaitCounter);
+                               mdelay(1);
+
+                               if (RFWaitCounter > 100) {
+                                       netdev_warn(dev,
+                                                   "%s(): Timeout waiting for RF change.\n",
+                                                   __func__);
+                                       return false;
                                }
-                       } else {
-                               priv->RFChangeInProgress = true;
-                               spin_unlock_irqrestore(&priv->rf_ps_lock, flag);
-                               break;
                        }
+               } else {
+                       priv->RFChangeInProgress = true;
+                       spin_unlock_irqrestore(&priv->rf_ps_lock, flag);
+                       break;
                }
        }
 
@@ -374,7 +206,7 @@ bool MgntActSet_RF_State(struct net_device *dev,
                                bConnectBySSID = true;
                } else {
                        RT_TRACE((COMP_PS | COMP_RF),
-                                "MgntActSet_RF_State - eRfon reject pMgntInfo->RfOffReason= 0x%x, ChangeSource=0x%X\n",
+                                "rtl92e_set_rf_state - eRfon reject pMgntInfo->RfOffReason= 0x%x, ChangeSource=0x%X\n",
                                  priv->rtllib->RfOffReason, ChangeSource);
        }
 
@@ -391,7 +223,7 @@ bool MgntActSet_RF_State(struct net_device *dev,
                                else
                                        priv->blinked_ingpio = false;
                                rtllib_MgntDisconnect(priv->rtllib,
-                                                     disas_lv_ss);
+                                                     WLAN_REASON_DISASSOC_STA_HAS_LEFT);
                        }
                }
                if ((ChangeSource == RF_CHANGE_BY_HW) && !priv->bHwRadioOff)
@@ -411,7 +243,7 @@ bool MgntActSet_RF_State(struct net_device *dev,
 
        if (bActionAllowed) {
                RT_TRACE((COMP_PS | COMP_RF),
-                        "MgntActSet_RF_State(): Action is allowed.... StateToSet(%d), RfOffReason(%#X)\n",
+                        "rtl92e_set_rf_state(): Action is allowed.... StateToSet(%d), RfOffReason(%#X)\n",
                         StateToSet, priv->rtllib->RfOffReason);
                PHY_SetRFPowerState(dev, StateToSet);
                if (StateToSet == eRfOn) {
@@ -424,37 +256,19 @@ bool MgntActSet_RF_State(struct net_device *dev,
                }
        } else {
                RT_TRACE((COMP_PS | COMP_RF),
-                        "MgntActSet_RF_State(): Action is rejected.... StateToSet(%d), ChangeSource(%#X), RfOffReason(%#X)\n",
+                        "rtl92e_set_rf_state(): Action is rejected.... StateToSet(%d), ChangeSource(%#X), RfOffReason(%#X)\n",
                         StateToSet, ChangeSource, priv->rtllib->RfOffReason);
        }
 
-       if (!ProtectOrNot) {
-               spin_lock_irqsave(&priv->rf_ps_lock, flag);
-               priv->RFChangeInProgress = false;
-               spin_unlock_irqrestore(&priv->rf_ps_lock, flag);
-       }
+       spin_lock_irqsave(&priv->rf_ps_lock, flag);
+       priv->RFChangeInProgress = false;
+       spin_unlock_irqrestore(&priv->rf_ps_lock, flag);
 
-       RT_TRACE((COMP_PS | COMP_RF), "<===MgntActSet_RF_State()\n");
+       RT_TRACE((COMP_PS | COMP_RF), "<===rtl92e_set_rf_state()\n");
        return bActionAllowed;
 }
 
-
-static short rtl8192_get_nic_desc_num(struct net_device *dev, int prio)
-{
-       struct r8192_priv *priv = rtllib_priv(dev);
-       struct rtl8192_tx_ring *ring = &priv->tx_ring[prio];
-
-       /* For now, we reserved two free descriptor as a safety boundary
-       * between the tail and the head
-       */
-       if ((prio == MGNT_QUEUE) && (skb_queue_len(&ring->queue) > 10))
-               RT_TRACE(COMP_DBG,
-                        "-----[%d]---------ring->idx=%d queue_len=%d---------\n",
-                        prio, ring->idx, skb_queue_len(&ring->queue));
-       return skb_queue_len(&ring->queue);
-}
-
-static short rtl8192_check_nic_enough_desc(struct net_device *dev, int prio)
+static short _rtl92e_check_nic_enough_desc(struct net_device *dev, int prio)
 {
        struct r8192_priv *priv = rtllib_priv(dev);
        struct rtl8192_tx_ring *ring = &priv->tx_ring[prio];
@@ -464,7 +278,7 @@ static short rtl8192_check_nic_enough_desc(struct net_device *dev, int prio)
        return 0;
 }
 
-void rtl8192_tx_timeout(struct net_device *dev)
+static void _rtl92e_tx_timeout(struct net_device *dev)
 {
        struct r8192_priv *priv = rtllib_priv(dev);
 
@@ -472,7 +286,7 @@ void rtl8192_tx_timeout(struct net_device *dev)
        netdev_info(dev, "TXTIMEOUT");
 }
 
-void rtl8192_irq_enable(struct net_device *dev)
+void rtl92e_irq_enable(struct net_device *dev)
 {
        struct r8192_priv *priv = (struct r8192_priv *)rtllib_priv(dev);
 
@@ -481,7 +295,7 @@ void rtl8192_irq_enable(struct net_device *dev)
        priv->ops->irq_enable(dev);
 }
 
-void rtl8192_irq_disable(struct net_device *dev)
+void rtl92e_irq_disable(struct net_device *dev)
 {
        struct r8192_priv *priv = (struct r8192_priv *)rtllib_priv(dev);
 
@@ -490,7 +304,7 @@ void rtl8192_irq_disable(struct net_device *dev)
        priv->irq_enabled = 0;
 }
 
-void rtl8192_set_chan(struct net_device *dev, short ch)
+static void _rtl92e_set_chan(struct net_device *dev, short ch)
 {
        struct r8192_priv *priv = (struct r8192_priv *)rtllib_priv(dev);
 
@@ -504,7 +318,7 @@ void rtl8192_set_chan(struct net_device *dev, short ch)
                priv->rf_set_chan(dev, priv->chan);
 }
 
-void rtl8192_update_cap(struct net_device *dev, u16 cap)
+static void _rtl92e_update_cap(struct net_device *dev, u16 cap)
 {
        struct r8192_priv *priv = rtllib_priv(dev);
        struct rtllib_network *net = &priv->rtllib->current_network;
@@ -561,7 +375,7 @@ static struct rtllib_qos_parameters def_qos_parameters = {
        {0, 0, 0, 0}
 };
 
-static void rtl8192_update_beacon(void *data)
+static void _rtl92e_update_beacon(void *data)
 {
        struct r8192_priv *priv = container_of_work_rsl(data, struct r8192_priv,
                                  update_beacon_wq.work);
@@ -574,10 +388,10 @@ static void rtl8192_update_beacon(void *data)
        ieee->pHTInfo->bCurrentRT2RTLongSlotTime =
                 net->bssht.bdRT2RTLongSlotTime;
        ieee->pHTInfo->RT2RT_HT_Mode = net->bssht.RT2RT_HT_Mode;
-       rtl8192_update_cap(dev, net->capability);
+       _rtl92e_update_cap(dev, net->capability);
 }
 
-static void rtl8192_qos_activate(void *data)
+static void _rtl92e_qos_activate(void *data)
 {
        struct r8192_priv *priv = container_of_work_rsl(data, struct r8192_priv,
                                  qos_activate);
@@ -598,9 +412,9 @@ success:
        mutex_unlock(&priv->mutex);
 }
 
-static int rtl8192_qos_handle_probe_response(struct r8192_priv *priv,
-               int active_network,
-               struct rtllib_network *network)
+static int _rtl92e_qos_handle_probe_response(struct r8192_priv *priv,
+                                            int active_network,
+                                            struct rtllib_network *network)
 {
        int ret = 0;
        u32 size = sizeof(struct rtllib_qos_parameters);
@@ -643,21 +457,21 @@ static int rtl8192_qos_handle_probe_response(struct r8192_priv *priv,
        return 0;
 }
 
-static int rtl8192_handle_beacon(struct net_device *dev,
-       struct rtllib_beacon *beacon,
-       struct rtllib_network *network)
+static int _rtl92e_handle_beacon(struct net_device *dev,
+                                struct rtllib_beacon *beacon,
+                                struct rtllib_network *network)
 {
        struct r8192_priv *priv = rtllib_priv(dev);
 
-       rtl8192_qos_handle_probe_response(priv, 1, network);
+       _rtl92e_qos_handle_probe_response(priv, 1, network);
 
        queue_delayed_work_rsl(priv->priv_wq, &priv->update_beacon_wq, 0);
        return 0;
 
 }
 
-static int rtl8192_qos_association_resp(struct r8192_priv *priv,
-       struct rtllib_network *network)
+static int _rtl92e_qos_assoc_resp(struct r8192_priv *priv,
+                                 struct rtllib_network *network)
 {
        unsigned long flags;
        u32 size = sizeof(struct rtllib_qos_parameters);
@@ -697,23 +511,23 @@ 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;
 }
 
-static int rtl8192_handle_assoc_response(struct net_device *dev,
+static int _rtl92e_handle_assoc_response(struct net_device *dev,
                                 struct rtllib_assoc_response_frame *resp,
                                 struct rtllib_network *network)
 {
        struct r8192_priv *priv = rtllib_priv(dev);
 
-       rtl8192_qos_association_resp(priv, network);
+       _rtl92e_qos_assoc_resp(priv, network);
        return 0;
 }
 
-static void rtl8192_prepare_beacon(struct r8192_priv *priv)
+static void _rtl92e_prepare_beacon(struct r8192_priv *priv)
 {
        struct net_device *dev = priv->rtllib->dev;
        struct sk_buff *pskb = NULL, *pnewskb = NULL;
@@ -743,11 +557,11 @@ static void rtl8192_prepare_beacon(struct r8192_priv *priv)
        pdesc->OWN = 1;
 }
 
-static void rtl8192_stop_beacon(struct net_device *dev)
+static void _rtl92e_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;
@@ -840,7 +654,7 @@ void rtl8192_config_rate(struct net_device *dev, u16 *rate_config)
        }
 }
 
-static void rtl8192_refresh_supportrate(struct r8192_priv *priv)
+static void _rtl92e_refresh_support_rate(struct r8192_priv *priv)
 {
        struct rtllib_device *ieee = priv->rtllib;
 
@@ -856,7 +670,7 @@ static void rtl8192_refresh_supportrate(struct r8192_priv *priv)
        }
 }
 
-static u8 rtl8192_getSupportedWireleeMode(struct net_device *dev)
+static u8 _rtl92e_get_supported_wireless_mode(struct net_device *dev)
 {
        struct r8192_priv *priv = rtllib_priv(dev);
        u8 ret = 0;
@@ -878,10 +692,10 @@ static u8 rtl8192_getSupportedWireleeMode(struct net_device *dev)
        return ret;
 }
 
-void rtl8192_SetWirelessMode(struct net_device *dev, u8 wireless_mode)
+void rtl92e_set_wireless_mode(struct net_device *dev, u8 wireless_mode)
 {
        struct r8192_priv *priv = rtllib_priv(dev);
-       u8 bSupportMode = rtl8192_getSupportedWireleeMode(dev);
+       u8 bSupportMode = _rtl92e_get_supported_wireless_mode(dev);
 
        if ((wireless_mode == WIRELESS_MODE_AUTO) ||
            ((wireless_mode & bSupportMode) == 0)) {
@@ -896,9 +710,9 @@ void rtl8192_SetWirelessMode(struct net_device *dev, u8 wireless_mode)
                } else if ((bSupportMode & WIRELESS_MODE_B)) {
                        wireless_mode = WIRELESS_MODE_B;
                } else {
-                       RT_TRACE(COMP_ERR,
-                                "%s(), No valid wireless mode supported (%x)!!!\n",
-                                __func__, bSupportMode);
+                       netdev_info(dev,
+                                   "%s(): Unsupported mode requested. Fallback to 802.11b\n",
+                                   __func__);
                        wireless_mode = WIRELESS_MODE_B;
                }
        }
@@ -909,9 +723,6 @@ void rtl8192_SetWirelessMode(struct net_device *dev, u8 wireless_mode)
 
        priv->rtllib->mode = wireless_mode;
 
-       ActUpdateChannelAccessSetting(dev, wireless_mode,
-                                     &priv->ChannelAccessSetting);
-
        if ((wireless_mode == WIRELESS_MODE_N_24G) ||
            (wireless_mode == WIRELESS_MODE_N_5G)) {
                priv->rtllib->pHTInfo->bEnableHT = 1;
@@ -924,10 +735,10 @@ void rtl8192_SetWirelessMode(struct net_device *dev, u8 wireless_mode)
        }
 
        RT_TRACE(COMP_INIT, "Current Wireless Mode is %x\n", wireless_mode);
-       rtl8192_refresh_supportrate(priv);
+       _rtl92e_refresh_support_rate(priv);
 }
 
-static int _rtl8192_sta_up(struct net_device *dev, bool is_silent_reset)
+static int _rtl92e_sta_up(struct net_device *dev, bool is_silent_reset)
 {
        struct r8192_priv *priv = rtllib_priv(dev);
        struct rt_pwr_save_ctrl *pPSC = (struct rt_pwr_save_ctrl *)
@@ -945,8 +756,7 @@ static int _rtl8192_sta_up(struct net_device *dev, bool is_silent_reset)
        priv->bfirst_init = true;
        init_status = priv->ops->initialize_adapter(dev);
        if (!init_status) {
-               RT_TRACE(COMP_ERR, "ERR!!! %s(): initialization is failed!\n",
-                        __func__);
+               netdev_err(dev, "%s(): Initialization failed!\n", __func__);
                priv->bfirst_init = false;
                return -1;
        }
@@ -956,12 +766,12 @@ static int _rtl8192_sta_up(struct net_device *dev, bool is_silent_reset)
        priv->bfirst_init = false;
 
        if (priv->polling_timer_on == 0)
-               check_rfctrl_gpio_timer((unsigned long)dev);
+               rtl92e_check_rfctrl_gpio_timer((unsigned long)dev);
 
        if (priv->rtllib->state != RTLLIB_LINKED)
                rtllib_softmac_start_protocol(priv->rtllib, 0);
        rtllib_reset_queue(priv->rtllib);
-       watch_dog_timer_callback((unsigned long) dev);
+       _rtl92e_watchdog_timer_cb((unsigned long)dev);
 
        if (!netif_queue_stopped(dev))
                netif_start_queue(dev);
@@ -971,7 +781,7 @@ static int _rtl8192_sta_up(struct net_device *dev, bool is_silent_reset)
        return 0;
 }
 
-static int rtl8192_sta_down(struct net_device *dev, bool shutdownrf)
+static int _rtl92e_sta_down(struct net_device *dev, bool shutdownrf)
 {
        struct r8192_priv *priv = rtllib_priv(dev);
        unsigned long flags = 0;
@@ -984,7 +794,7 @@ static int rtl8192_sta_down(struct net_device *dev, bool shutdownrf)
                priv->rtllib->rtllib_ips_leave(dev);
 
        if (priv->rtllib->state == RTLLIB_LINKED)
-               LeisurePSLeave(dev);
+               rtl92e_leisure_ps_leave(dev);
 
        priv->bDriverIsGoingToUnload = true;
        priv->up = 0;
@@ -997,12 +807,12 @@ static int rtl8192_sta_down(struct net_device *dev, bool shutdownrf)
        priv->rtllib->wpa_ie_len = 0;
        kfree(priv->rtllib->wpa_ie);
        priv->rtllib->wpa_ie = NULL;
-       CamResetAllEntry(dev);
+       rtl92e_cam_reset(dev);
        memset(priv->rtllib->swcamtable, 0, sizeof(struct sw_cam_table) * 32);
-       rtl8192_irq_disable(dev);
+       rtl92e_irq_disable(dev);
 
        del_timer_sync(&priv->watch_dog_timer);
-       rtl8192_cancel_deferred_work(priv);
+       _rtl92e_cancel_deferred_work(priv);
        cancel_delayed_work(&priv->rtllib->hw_wakeup_wq);
 
        rtllib_softmac_stop_protocol(priv->rtllib, 0, true);
@@ -1034,90 +844,70 @@ static int rtl8192_sta_down(struct net_device *dev, bool shutdownrf)
        return 0;
 }
 
-static void rtl8192_init_priv_handler(struct net_device *dev)
+static void _rtl92e_init_priv_handler(struct net_device *dev)
 {
        struct r8192_priv *priv = rtllib_priv(dev);
 
-       priv->rtllib->softmac_hard_start_xmit   = rtl8192_hard_start_xmit;
-       priv->rtllib->set_chan                  = rtl8192_set_chan;
+       priv->rtllib->softmac_hard_start_xmit   = _rtl92e_hard_start_xmit;
+       priv->rtllib->set_chan                  = _rtl92e_set_chan;
        priv->rtllib->link_change               = priv->ops->link_change;
-       priv->rtllib->softmac_data_hard_start_xmit = rtl8192_hard_data_xmit;
-       priv->rtllib->data_hard_stop            = rtl8192_data_hard_stop;
-       priv->rtllib->data_hard_resume          = rtl8192_data_hard_resume;
-       priv->rtllib->check_nic_enough_desc     = rtl8192_check_nic_enough_desc;
-       priv->rtllib->get_nic_desc_num          = rtl8192_get_nic_desc_num;
-       priv->rtllib->handle_assoc_response     = rtl8192_handle_assoc_response;
-       priv->rtllib->handle_beacon             = rtl8192_handle_beacon;
-       priv->rtllib->SetWirelessMode           = rtl8192_SetWirelessMode;
-       priv->rtllib->LeisurePSLeave            = LeisurePSLeave;
-       priv->rtllib->SetBWModeHandler          = rtl8192_SetBWMode;
-       priv->rf_set_chan                       = rtl8192_phy_SwChnl;
-
-       priv->rtllib->start_send_beacons = rtl8192e_start_beacon;
-       priv->rtllib->stop_send_beacons = rtl8192_stop_beacon;
-
-       priv->rtllib->sta_wake_up = rtl8192_hw_wakeup;
-       priv->rtllib->enter_sleep_state = rtl8192_hw_to_sleep;
-       priv->rtllib->ps_is_queue_empty = rtl8192_is_tx_queue_empty;
-
-       priv->rtllib->GetNmodeSupportBySecCfg = rtl8192_GetNmodeSupportBySecCfg;
+       priv->rtllib->softmac_data_hard_start_xmit = _rtl92e_hard_data_xmit;
+       priv->rtllib->check_nic_enough_desc     = _rtl92e_check_nic_enough_desc;
+       priv->rtllib->handle_assoc_response     = _rtl92e_handle_assoc_response;
+       priv->rtllib->handle_beacon             = _rtl92e_handle_beacon;
+       priv->rtllib->SetWirelessMode           = rtl92e_set_wireless_mode;
+       priv->rtllib->LeisurePSLeave            = rtl92e_leisure_ps_leave;
+       priv->rtllib->SetBWModeHandler          = rtl92e_set_bw_mode;
+       priv->rf_set_chan                       = rtl92e_set_channel;
+
+       priv->rtllib->start_send_beacons = rtl92e_start_beacon;
+       priv->rtllib->stop_send_beacons = _rtl92e_stop_beacon;
+
+       priv->rtllib->sta_wake_up = rtl92e_hw_wakeup;
+       priv->rtllib->enter_sleep_state = rtl92e_enter_sleep;
+       priv->rtllib->ps_is_queue_empty = _rtl92e_is_tx_queue_empty;
+
+       priv->rtllib->GetNmodeSupportBySecCfg = rtl92e_get_nmode_support_by_sec;
        priv->rtllib->GetHalfNmodeSupportByAPsHandler =
-                                        rtl8192_GetHalfNmodeSupportByAPs;
+                                               rtl92e_is_halfn_supported_by_ap;
 
-       priv->rtllib->SetHwRegHandler = rtl8192e_SetHwReg;
-       priv->rtllib->AllowAllDestAddrHandler = rtl8192_AllowAllDestAddr;
+       priv->rtllib->SetHwRegHandler = rtl92e_set_reg;
+       priv->rtllib->AllowAllDestAddrHandler = rtl92e_set_monitor_mode;
        priv->rtllib->SetFwCmdHandler = NULL;
-       priv->rtllib->InitialGainHandler = InitialGain819xPci;
-       priv->rtllib->rtllib_ips_leave_wq = rtllib_ips_leave_wq;
-       priv->rtllib->rtllib_ips_leave = rtllib_ips_leave;
+       priv->rtllib->InitialGainHandler = rtl92e_init_gain;
+       priv->rtllib->rtllib_ips_leave_wq = rtl92e_rtllib_ips_leave_wq;
+       priv->rtllib->rtllib_ips_leave = rtl92e_rtllib_ips_leave;
 
        priv->rtllib->LedControlHandler = NULL;
        priv->rtllib->UpdateBeaconInterruptHandler = NULL;
 
-       priv->rtllib->ScanOperationBackupHandler = PHY_ScanOperationBackup8192;
-
-       priv->rtllib->rtllib_rfkill_poll = NULL;
+       priv->rtllib->ScanOperationBackupHandler = rtl92e_scan_op_backup;
 }
 
-static void rtl8192_init_priv_constant(struct net_device *dev)
+static void _rtl92e_init_priv_constant(struct net_device *dev)
 {
        struct r8192_priv *priv = rtllib_priv(dev);
        struct rt_pwr_save_ctrl *pPSC = (struct rt_pwr_save_ctrl *)
                                        &(priv->rtllib->PowerSaveControl);
 
        pPSC->RegMaxLPSAwakeIntvl = 5;
-
-       priv->RegPciASPM = 2;
-
-       priv->RegDevicePciASPMSetting = 0x03;
-
-       priv->RegHostPciASPMSetting = 0x02;
-
-       priv->RegHwSwRfOffD3 = 2;
-
-       priv->RegSupportPciASPM = 2;
 }
 
 
-static void rtl8192_init_priv_variable(struct net_device *dev)
+static void _rtl92e_init_priv_variable(struct net_device *dev)
 {
        struct r8192_priv *priv = rtllib_priv(dev);
        u8 i;
 
        priv->AcmMethod = eAcmWay2_SW;
        priv->dot11CurrentPreambleMode = PREAMBLE_AUTO;
-       priv->rtllib->hwscan_sem_up = 1;
        priv->rtllib->status = 0;
-       priv->H2CTxCmdSeq = 0;
-       priv->bDisableFrameBursting = false;
-       priv->bDMInitialGainEnable = true;
        priv->polling_timer_on = 0;
        priv->up_first_time = 1;
        priv->blinked_ingpio = false;
        priv->bDriverIsGoingToUnload = false;
        priv->being_init_adapter = false;
        priv->initialized_at_probe = false;
-       priv->sw_radio_on = true;
        priv->bdisable_nic = false;
        priv->bfirst_init = false;
        priv->txringcount = 64;
@@ -1125,12 +915,7 @@ static void rtl8192_init_priv_variable(struct net_device *dev)
        priv->rxringcount = MAX_RX_COUNT;
        priv->irq_enabled = 0;
        priv->chan = 1;
-       priv->RegWirelessMode = WIRELESS_MODE_AUTO;
        priv->RegChannelPlan = 0xf;
-       priv->nrxAMPDU_size = 0;
-       priv->nrxAMPDU_aggr_num = 0;
-       priv->last_rxdesc_tsf_high = 0;
-       priv->last_rxdesc_tsf_low = 0;
        priv->rtllib->mode = WIRELESS_MODE_AUTO;
        priv->rtllib->iw_mode = IW_MODE_INFRA;
        priv->rtllib->bNetPromiscuousMode = false;
@@ -1176,12 +961,6 @@ static void rtl8192_init_priv_variable(struct net_device *dev)
        priv->rtllib->sta_sleep = LPS_IS_WAKE;
        priv->rtllib->eRFPowerState = eRfOn;
 
-       priv->txpower_checkcnt = 0;
-       priv->thermal_readback_index = 0;
-       priv->txpower_tracking_callback_cnt = 0;
-       priv->ccktxpower_adjustcnt_ch14 = 0;
-       priv->ccktxpower_adjustcnt_not_ch14 = 0;
-
        priv->rtllib->current_network.beacon_interval = DEFAULT_BEACONINTERVAL;
        priv->rtllib->iw_mode = IW_MODE_INFRA;
        priv->rtllib->active_scan = 1;
@@ -1191,20 +970,15 @@ static void rtl8192_init_priv_variable(struct net_device *dev)
        priv->rtllib->host_encrypt = 1;
        priv->rtllib->host_decrypt = 1;
 
-       priv->rtllib->dot11PowerSaveMode = eActive;
        priv->rtllib->fts = DEFAULT_FRAG_THRESHOLD;
-       priv->rtllib->MaxMssDensity = 0;
-       priv->rtllib->MinSpaceCfg = 0;
 
        priv->card_type = PCI;
 
-       priv->AcmControl = 0;
        priv->pFirmware = vzalloc(sizeof(struct rt_firmware));
        if (!priv->pFirmware)
                netdev_err(dev,
                           "rtl8192e: Unable to allocate space for firmware\n");
 
-       skb_queue_head_init(&priv->rx_queue);
        skb_queue_head_init(&priv->skb_queue);
 
        for (i = 0; i < MAX_QUEUE_SIZE; i++)
@@ -1213,53 +987,50 @@ static void rtl8192_init_priv_variable(struct net_device *dev)
                skb_queue_head_init(&priv->rtllib->skb_aggQ[i]);
 }
 
-static void rtl8192_init_priv_lock(struct r8192_priv *priv)
+static void _rtl92e_init_priv_lock(struct r8192_priv *priv)
 {
-       spin_lock_init(&priv->fw_scan_lock);
        spin_lock_init(&priv->tx_lock);
-       spin_lock_init(&priv->irq_lock);
        spin_lock_init(&priv->irq_th_lock);
        spin_lock_init(&priv->rf_ps_lock);
        spin_lock_init(&priv->ps_lock);
-       spin_lock_init(&priv->rf_lock);
-       spin_lock_init(&priv->rt_h2c_lock);
        sema_init(&priv->wx_sem, 1);
        sema_init(&priv->rf_sem, 1);
        mutex_init(&priv->mutex);
 }
 
-static void rtl8192_init_priv_task(struct net_device *dev)
+static void _rtl92e_init_priv_task(struct net_device *dev)
 {
        struct r8192_priv *priv = rtllib_priv(dev);
 
        priv->priv_wq = create_workqueue(DRV_NAME);
-       INIT_WORK_RSL(&priv->reset_wq, (void *)rtl8192_restart, dev);
-       INIT_WORK_RSL(&priv->rtllib->ips_leave_wq, (void *)IPSLeave_wq, dev);
+       INIT_WORK_RSL(&priv->reset_wq, (void *)_rtl92e_restart, dev);
+       INIT_WORK_RSL(&priv->rtllib->ips_leave_wq, (void *)rtl92e_ips_leave_wq,
+                     dev);
        INIT_DELAYED_WORK_RSL(&priv->watch_dog_wq,
-                             (void *)rtl819x_watchdog_wqcallback, dev);
+                             (void *)_rtl92e_watchdog_wq_cb, dev);
        INIT_DELAYED_WORK_RSL(&priv->txpower_tracking_wq,
-                             (void *)dm_txpower_trackingcallback, dev);
+                             (void *)rtl92e_dm_txpower_tracking_wq, dev);
        INIT_DELAYED_WORK_RSL(&priv->rfpath_check_wq,
-                             (void *)dm_rf_pathcheck_workitemcallback, dev);
+                             (void *)rtl92e_dm_rf_pathcheck_wq, dev);
        INIT_DELAYED_WORK_RSL(&priv->update_beacon_wq,
-                             (void *)rtl8192_update_beacon, dev);
-       INIT_WORK_RSL(&priv->qos_activate, (void *)rtl8192_qos_activate, dev);
+                             (void *)_rtl92e_update_beacon, dev);
+       INIT_WORK_RSL(&priv->qos_activate, (void *)_rtl92e_qos_activate, dev);
        INIT_DELAYED_WORK_RSL(&priv->rtllib->hw_wakeup_wq,
-                             (void *) rtl8192_hw_wakeup_wq, dev);
+                             (void *) rtl92e_hw_wakeup_wq, dev);
        INIT_DELAYED_WORK_RSL(&priv->rtllib->hw_sleep_wq,
-                             (void *) rtl8192_hw_sleep_wq, dev);
+                             (void *) rtl92e_hw_sleep_wq, dev);
        tasklet_init(&priv->irq_rx_tasklet,
-                    (void(*)(unsigned long))rtl8192_irq_rx_tasklet,
+                    (void(*)(unsigned long))_rtl92e_irq_rx_tasklet,
                     (unsigned long)priv);
        tasklet_init(&priv->irq_tx_tasklet,
-                    (void(*)(unsigned long))rtl8192_irq_tx_tasklet,
+                    (void(*)(unsigned long))_rtl92e_irq_tx_tasklet,
                     (unsigned long)priv);
        tasklet_init(&priv->irq_prepare_beacon_tasklet,
-                    (void(*)(unsigned long))rtl8192_prepare_beacon,
+                    (void(*)(unsigned long))_rtl92e_prepare_beacon,
                     (unsigned long)priv);
 }
 
-static short rtl8192_get_channel_map(struct net_device *dev)
+static short _rtl92e_get_channel_map(struct net_device *dev)
 {
        int i;
 
@@ -1267,9 +1038,8 @@ static short rtl8192_get_channel_map(struct net_device *dev)
 
        if ((priv->rf_chip != RF_8225) && (priv->rf_chip != RF_8256)
                        && (priv->rf_chip != RF_6052)) {
-               RT_TRACE(COMP_ERR,
-                        "%s: unknown rf chip, can't set channel map\n",
-                        __func__);
+               netdev_err(dev, "%s: unknown rf chip, can't set channel map\n",
+                          __func__);
                return -1;
        }
 
@@ -1289,36 +1059,33 @@ static short rtl8192_get_channel_map(struct net_device *dev)
        return 0;
 }
 
-static short rtl8192_init(struct net_device *dev)
+static short _rtl92e_init(struct net_device *dev)
 {
        struct r8192_priv *priv = rtllib_priv(dev);
 
        memset(&(priv->stats), 0, sizeof(struct rt_stats));
 
-       rtl8192_init_priv_handler(dev);
-       rtl8192_init_priv_constant(dev);
-       rtl8192_init_priv_variable(dev);
-       rtl8192_init_priv_lock(priv);
-       rtl8192_init_priv_task(dev);
+       _rtl92e_init_priv_handler(dev);
+       _rtl92e_init_priv_constant(dev);
+       _rtl92e_init_priv_variable(dev);
+       _rtl92e_init_priv_lock(priv);
+       _rtl92e_init_priv_task(dev);
        priv->ops->get_eeprom_size(dev);
        priv->ops->init_adapter_variable(dev);
-       rtl8192_get_channel_map(dev);
+       _rtl92e_get_channel_map(dev);
 
-       init_hal_dm(dev);
+       rtl92e_dm_init(dev);
 
-       init_timer(&priv->watch_dog_timer);
        setup_timer(&priv->watch_dog_timer,
-                   watch_dog_timer_callback,
+                   _rtl92e_watchdog_timer_cb,
                    (unsigned long) dev);
 
-       init_timer(&priv->gpio_polling_timer);
        setup_timer(&priv->gpio_polling_timer,
-                   check_rfctrl_gpio_timer,
+                   rtl92e_check_rfctrl_gpio_timer,
                    (unsigned long)dev);
 
-       rtl8192_irq_disable(dev);
-       if (request_irq(dev->irq, rtl8192_interrupt, IRQF_SHARED,
-           dev->name, dev)) {
+       rtl92e_irq_disable(dev);
+       if (request_irq(dev->irq, _rtl92e_irq, IRQF_SHARED, dev->name, dev)) {
                netdev_err(dev, "Error allocating IRQ %d", dev->irq);
                return -1;
        }
@@ -1326,7 +1093,7 @@ static short rtl8192_init(struct net_device *dev)
        priv->irq = dev->irq;
        RT_TRACE(COMP_INIT, "IRQ %d\n", dev->irq);
 
-       if (rtl8192_pci_initdescring(dev) != 0) {
+       if (_rtl92e_pci_initdescring(dev) != 0) {
                netdev_err(dev, "Endopoints initialization failed");
                free_irq(dev->irq, dev);
                return -1;
@@ -1338,7 +1105,7 @@ static short rtl8192_init(struct net_device *dev)
 /***************************************************************************
        -------------------------------WATCHDOG STUFF---------------------------
 ***************************************************************************/
-short rtl8192_is_tx_queue_empty(struct net_device *dev)
+static short _rtl92e_is_tx_queue_empty(struct net_device *dev)
 {
        int i = 0;
        struct r8192_priv *priv = rtllib_priv(dev);
@@ -1355,11 +1122,10 @@ short rtl8192_is_tx_queue_empty(struct net_device *dev)
        return 1;
 }
 
-static enum reset_type rtl819x_TxCheckStuck(struct net_device *dev)
+static enum reset_type _rtl92e_tx_check_stuck(struct net_device *dev)
 {
        struct r8192_priv *priv = rtllib_priv(dev);
        u8      QueueID;
-       u8      ResetThreshold = NIC_SEND_HANG_THRESHOLD_POWERSAVE;
        bool    bCheckFwTxCnt = false;
        struct rtl8192_tx_ring  *ring = NULL;
        struct sk_buff *skb = NULL;
@@ -1368,13 +1134,10 @@ static enum reset_type rtl819x_TxCheckStuck(struct net_device *dev)
 
        switch (priv->rtllib->ps) {
        case RTLLIB_PS_DISABLED:
-               ResetThreshold = NIC_SEND_HANG_THRESHOLD_NORMAL;
                break;
        case (RTLLIB_PS_MBCAST|RTLLIB_PS_UNICAST):
-               ResetThreshold = NIC_SEND_HANG_THRESHOLD_POWERSAVE;
                break;
        default:
-               ResetThreshold = NIC_SEND_HANG_THRESHOLD_POWERSAVE;
                break;
        }
        spin_lock_irqsave(&priv->irq_th_lock, flags);
@@ -1415,7 +1178,7 @@ static enum reset_type rtl819x_TxCheckStuck(struct net_device *dev)
        return RESET_TYPE_NORESET;
 }
 
-static enum reset_type rtl819x_RxCheckStuck(struct net_device *dev)
+static enum reset_type _rtl92e_rx_check_stuck(struct net_device *dev)
 {
        struct r8192_priv *priv = rtllib_priv(dev);
 
@@ -1427,7 +1190,7 @@ static enum reset_type rtl819x_RxCheckStuck(struct net_device *dev)
        return RESET_TYPE_NORESET;
 }
 
-static enum reset_type rtl819x_ifcheck_resetornot(struct net_device *dev)
+static enum reset_type _rtl92e_if_check_reset(struct net_device *dev)
 {
        struct r8192_priv *priv = rtllib_priv(dev);
        enum reset_type TxResetType = RESET_TYPE_NORESET;
@@ -1437,12 +1200,12 @@ static enum reset_type rtl819x_ifcheck_resetornot(struct net_device *dev)
        rfState = priv->rtllib->eRFPowerState;
 
        if (rfState == eRfOn)
-               TxResetType = rtl819x_TxCheckStuck(dev);
+               TxResetType = _rtl92e_tx_check_stuck(dev);
 
        if (rfState == eRfOn &&
            (priv->rtllib->iw_mode == IW_MODE_INFRA) &&
            (priv->rtllib->state == RTLLIB_LINKED))
-               RxResetType = rtl819x_RxCheckStuck(dev);
+               RxResetType = _rtl92e_rx_check_stuck(dev);
 
        if (TxResetType == RESET_TYPE_NORMAL ||
            RxResetType == RESET_TYPE_NORMAL) {
@@ -1460,11 +1223,7 @@ static enum reset_type rtl819x_ifcheck_resetornot(struct net_device *dev)
 
 }
 
-static void rtl819x_silentreset_mesh_bk(struct net_device *dev, u8 IsPortal)
-{
-}
-
-static void rtl819x_ifsilentreset(struct net_device *dev)
+static void _rtl92e_if_silent_reset(struct net_device *dev)
 {
        struct r8192_priv *priv = rtllib_priv(dev);
        u8      reset_times = 0;
@@ -1472,9 +1231,6 @@ static void rtl819x_ifsilentreset(struct net_device *dev)
        struct rtllib_device *ieee = priv->rtllib;
        unsigned long flag;
 
-       u8 IsPortal = 0;
-
-
        if (priv->ResetProgress == RESET_TYPE_NORESET) {
 
                RT_TRACE(COMP_RESET, "=========>Reset progress!!\n");
@@ -1495,12 +1251,11 @@ RESET_START:
                down(&priv->wx_sem);
 
                if (priv->rtllib->state == RTLLIB_LINKED)
-                       LeisurePSLeave(dev);
+                       rtl92e_leisure_ps_leave(dev);
 
                if (priv->up) {
-                       RT_TRACE(COMP_ERR,
-                                "%s():the driver is not up! return\n",
-                                __func__);
+                       netdev_info(dev, "%s():the driver is not up.\n",
+                                   __func__);
                        up(&priv->wx_sem);
                        return;
                }
@@ -1516,10 +1271,10 @@ RESET_START:
                if (!netif_queue_stopped(dev))
                        netif_stop_queue(dev);
 
-               rtl8192_irq_disable(dev);
+               rtl92e_irq_disable(dev);
                del_timer_sync(&priv->watch_dog_timer);
-               rtl8192_cancel_deferred_work(priv);
-               deinit_hal_dm(dev);
+               _rtl92e_cancel_deferred_work(priv);
+               rtl92e_dm_deinit(dev);
                rtllib_stop_scan_syncro(ieee);
 
                if (ieee->state == RTLLIB_LINKED) {
@@ -1533,10 +1288,10 @@ RESET_START:
                        SEM_UP_IEEE_WX(&ieee->wx_sem);
                } else {
                        netdev_info(dev, "ieee->state is NOT LINKED\n");
-                       rtllib_softmac_stop_protocol(priv->rtllib, 0 , true);
+                       rtllib_softmac_stop_protocol(priv->rtllib, 0, true);
                }
 
-               dm_backup_dynamic_mechanism_state(dev);
+               rtl92e_dm_backup_state(dev);
 
                up(&priv->wx_sem);
                RT_TRACE(COMP_RESET,
@@ -1545,7 +1300,7 @@ RESET_START:
 
                RT_TRACE(COMP_RESET, "%s():<===========up process start\n",
                         __func__);
-               reset_status = _rtl8192_up(dev, true);
+               reset_status = _rtl92e_up(dev, true);
 
                RT_TRACE(COMP_RESET,
                         "%s():<===========up process is finished\n", __func__);
@@ -1554,9 +1309,8 @@ RESET_START:
                                reset_times++;
                                goto RESET_START;
                        } else {
-                               RT_TRACE(COMP_ERR,
-                                        " ERR!!! %s():  Reset Failed!!\n",
-                                        __func__);
+                               netdev_warn(dev, "%s(): Reset Failed\n",
+                                           __func__);
                        }
                }
 
@@ -1566,7 +1320,7 @@ RESET_START:
                priv->RFChangeInProgress = false;
                spin_unlock_irqrestore(&priv->rf_ps_lock, flag);
 
-               EnableHWSecurityConfig8192(dev);
+               rtl92e_enable_hw_security_config(dev);
 
                if (ieee->state == RTLLIB_LINKED && ieee->iw_mode ==
                    IW_MODE_INFRA) {
@@ -1585,15 +1339,11 @@ RESET_START:
 
                        rtllib_start_send_beacons(ieee);
 
-                       if (ieee->data_hard_resume)
-                               ieee->data_hard_resume(ieee->dev);
                        netif_carrier_on(ieee->dev);
-               } else if (ieee->iw_mode == IW_MODE_MESH) {
-                       rtl819x_silentreset_mesh_bk(dev, IsPortal);
                }
 
-               CamRestoreAllEntry(dev);
-               dm_restore_dynamic_mechanism_state(dev);
+               rtl92e_cam_restore(dev);
+               rtl92e_dm_restore_state(dev);
 END:
                priv->ResetProgress = RESET_TYPE_NORESET;
                priv->reset_count++;
@@ -1601,13 +1351,13 @@ END:
                priv->bForcedSilentReset = false;
                priv->bResetInProgress = false;
 
-               write_nic_byte(dev, UFWP, 1);
+               rtl92e_writeb(dev, UFWP, 1);
                RT_TRACE(COMP_RESET, "Reset finished!! ====>[%d]\n",
                         priv->reset_count);
        }
 }
 
-static void rtl819x_update_rxcounts(struct r8192_priv *priv, u32 *TotalRxBcnNum,
+static void _rtl92e_update_rxcounts(struct r8192_priv *priv, u32 *TotalRxBcnNum,
                                    u32 *TotalRxDataNum)
 {
        u16     SlotIndex;
@@ -1628,8 +1378,7 @@ static void rtl819x_update_rxcounts(struct r8192_priv *priv, u32 *TotalRxBcnNum,
        }
 }
 
-
-void   rtl819x_watchdog_wqcallback(void *data)
+static void _rtl92e_watchdog_wq_cb(void *data)
 {
        struct r8192_priv *priv = container_of_dwork_rsl(data,
                                  struct r8192_priv, watch_dog_wq);
@@ -1655,7 +1404,7 @@ void      rtl819x_watchdog_wqcallback(void *data)
                priv->rtllib->CntAfterLink = 0;
        }
 
-       hal_dm_watchdog(dev);
+       rtl92e_dm_watchdog(dev);
 
        if (rtllib_act_scanning(priv->rtllib, false) == false) {
                if ((ieee->iw_mode == IW_MODE_INFRA) && (ieee->state ==
@@ -1666,8 +1415,8 @@ void      rtl819x_watchdog_wqcallback(void *data)
                             IPS_CALLBACK_NONE) &&
                             (!ieee->bNetPromiscuousMode)) {
                                RT_TRACE(COMP_PS,
-                                        "====================>haha: IPSEnter()\n");
-                               IPSEnter(dev);
+                                        "====================>haha: rtl92e_ips_enter()\n");
+                               rtl92e_ips_enter(dev);
                        }
                }
        }
@@ -1698,13 +1447,13 @@ void    rtl819x_watchdog_wqcallback(void *data)
                        bEnterPS = false;
 
                if (bEnterPS)
-                       LeisurePSEnter(dev);
+                       rtl92e_leisure_ps_enter(dev);
                else
-                       LeisurePSLeave(dev);
+                       rtl92e_leisure_ps_leave(dev);
 
        } else {
                RT_TRACE(COMP_LPS, "====>no link LPS leave\n");
-               LeisurePSLeave(dev);
+               rtl92e_leisure_ps_leave(dev);
        }
 
        ieee->LinkDetectInfo.NumRxOkInPeriod = 0;
@@ -1719,7 +1468,7 @@ void      rtl819x_watchdog_wqcallback(void *data)
                u32     TotalRxBcnNum = 0;
                u32     TotalRxDataNum = 0;
 
-               rtl819x_update_rxcounts(priv, &TotalRxBcnNum, &TotalRxDataNum);
+               _rtl92e_update_rxcounts(priv, &TotalRxBcnNum, &TotalRxDataNum);
 
                if ((TotalRxBcnNum+TotalRxDataNum) == 0)
                        priv->check_roaming_cnt++;
@@ -1729,7 +1478,7 @@ void      rtl819x_watchdog_wqcallback(void *data)
 
                if (priv->check_roaming_cnt > 0) {
                        if (ieee->eRFPowerState == eRfOff)
-                               RT_TRACE(COMP_ERR, "========>%s()\n", __func__);
+                               netdev_info(dev, "%s(): RF is off\n", __func__);
 
                        netdev_info(dev,
                                    "===>%s(): AP is power off, chan:%d, connect another one\n",
@@ -1763,7 +1512,7 @@ void      rtl819x_watchdog_wqcallback(void *data)
        spin_lock_irqsave(&priv->tx_lock, flags);
        if ((check_reset_cnt++ >= 3) && (!ieee->is_roaming) &&
            (!priv->RFChangeInProgress) && (!pPSC->bSwRfProcessing)) {
-               ResetType = rtl819x_ifcheck_resetornot(dev);
+               ResetType = _rtl92e_if_check_reset(dev);
                check_reset_cnt = 3;
        }
        spin_unlock_irqrestore(&priv->tx_lock, flags);
@@ -1776,14 +1525,14 @@ void    rtl819x_watchdog_wqcallback(void *data)
 
        if (((priv->force_reset) || (!priv->bDisableNormalResetCheck &&
              ResetType == RESET_TYPE_SILENT)))
-               rtl819x_ifsilentreset(dev);
+               _rtl92e_if_silent_reset(dev);
        priv->force_reset = false;
        priv->bForcedSilentReset = false;
        priv->bResetInProgress = false;
        RT_TRACE(COMP_TRACE, " <==RtUsbCheckForHangWorkItemCallback()\n");
 }
 
-void watch_dog_timer_callback(unsigned long data)
+static void _rtl92e_watchdog_timer_cb(unsigned long data)
 {
        struct r8192_priv *priv = rtllib_priv((struct net_device *)data);
 
@@ -1795,14 +1544,14 @@ void watch_dog_timer_callback(unsigned long data)
 /****************************************************************************
  ---------------------------- NIC TX/RX STUFF---------------------------
 *****************************************************************************/
-void rtl8192_rx_enable(struct net_device *dev)
+void rtl92e_rx_enable(struct net_device *dev)
 {
        struct r8192_priv *priv = (struct r8192_priv *)rtllib_priv(dev);
 
        priv->ops->rx_enable(dev);
 }
 
-void rtl8192_tx_enable(struct net_device *dev)
+void rtl92e_tx_enable(struct net_device *dev)
 {
        struct r8192_priv *priv = (struct r8192_priv *)rtllib_priv(dev);
 
@@ -1812,7 +1561,7 @@ void rtl8192_tx_enable(struct net_device *dev)
 }
 
 
-static void rtl8192_free_rx_ring(struct net_device *dev)
+static void _rtl92e_free_rx_ring(struct net_device *dev)
 {
        struct r8192_priv *priv = rtllib_priv(dev);
        int i, rx_queue_idx;
@@ -1840,7 +1589,7 @@ static void rtl8192_free_rx_ring(struct net_device *dev)
        }
 }
 
-static void rtl8192_free_tx_ring(struct net_device *dev, unsigned int prio)
+static void _rtl92e_free_tx_ring(struct net_device *dev, unsigned int prio)
 {
        struct r8192_priv *priv = rtllib_priv(dev);
        struct rtl8192_tx_ring *ring = &priv->tx_ring[prio];
@@ -1860,17 +1609,8 @@ static void rtl8192_free_tx_ring(struct net_device *dev, unsigned int prio)
        ring->desc = NULL;
 }
 
-void rtl8192_data_hard_stop(struct net_device *dev)
-{
-}
-
-
-void rtl8192_data_hard_resume(struct net_device *dev)
-{
-}
-
-void rtl8192_hard_data_xmit(struct sk_buff *skb, struct net_device *dev,
-                           int rate)
+static void _rtl92e_hard_data_xmit(struct sk_buff *skb, struct net_device *dev,
+                                  int rate)
 {
        struct r8192_priv *priv = (struct r8192_priv *)rtllib_priv(dev);
        int ret;
@@ -1884,12 +1624,13 @@ void rtl8192_hard_data_xmit(struct sk_buff *skb, struct net_device *dev,
                return;
        }
 
-       assert(queue_index != TXCMD_QUEUE);
-
+       if (queue_index == TXCMD_QUEUE)
+               netdev_warn(dev, "%s(): queue index == TXCMD_QUEUE\n",
+                           __func__);
 
        memcpy((unsigned char *)(skb->cb), &dev, sizeof(dev));
        skb_push(skb, priv->rtllib->tx_headroom);
-       ret = rtl8192_tx(dev, skb);
+       ret = _rtl92e_tx(dev, skb);
        if (ret != 0)
                kfree_skb(skb);
 
@@ -1900,7 +1641,7 @@ void rtl8192_hard_data_xmit(struct sk_buff *skb, struct net_device *dev,
        }
 }
 
-int rtl8192_hard_start_xmit(struct sk_buff *skb, struct net_device *dev)
+static int _rtl92e_hard_start_xmit(struct sk_buff *skb, struct net_device *dev)
 {
        struct r8192_priv *priv = (struct r8192_priv *)rtllib_priv(dev);
        int ret;
@@ -1918,7 +1659,7 @@ int rtl8192_hard_start_xmit(struct sk_buff *skb, struct net_device *dev)
 
        memcpy((unsigned char *)(skb->cb), &dev, sizeof(dev));
        if (queue_index == TXCMD_QUEUE) {
-               rtl8192_tx_cmd(dev, skb);
+               _rtl92e_tx_cmd(dev, skb);
                return 0;
        }
 
@@ -1927,13 +1668,13 @@ int rtl8192_hard_start_xmit(struct sk_buff *skb, struct net_device *dev)
        tcb_desc->bTxUseDriverAssingedRate = 1;
        tcb_desc->bTxEnableFwCalcDur = 1;
        skb_push(skb, priv->rtllib->tx_headroom);
-       ret = rtl8192_tx(dev, skb);
+       ret = _rtl92e_tx(dev, skb);
        if (ret != 0)
                kfree_skb(skb);
        return ret;
 }
 
-static void rtl8192_tx_isr(struct net_device *dev, int prio)
+static void _rtl92e_tx_isr(struct net_device *dev, int prio)
 {
        struct r8192_priv *priv = (struct r8192_priv *)rtllib_priv(dev);
 
@@ -1959,7 +1700,7 @@ static void rtl8192_tx_isr(struct net_device *dev, int prio)
                tasklet_schedule(&priv->irq_tx_tasklet);
 }
 
-void rtl8192_tx_cmd(struct net_device *dev, struct sk_buff *skb)
+static void _rtl92e_tx_cmd(struct net_device *dev, struct sk_buff *skb)
 {
        struct r8192_priv *priv = rtllib_priv(dev);
        struct rtl8192_tx_ring *ring;
@@ -1982,7 +1723,7 @@ void rtl8192_tx_cmd(struct net_device *dev, struct sk_buff *skb)
        spin_unlock_irqrestore(&priv->irq_th_lock, flags);
 }
 
-short rtl8192_tx(struct net_device *dev, struct sk_buff *skb)
+static short _rtl92e_tx(struct net_device *dev, struct sk_buff *skb)
 {
        struct r8192_priv *priv = rtllib_priv(dev);
        struct rtl8192_tx_ring  *ring;
@@ -1998,9 +1739,8 @@ short rtl8192_tx(struct net_device *dev, struct sk_buff *skb)
        u32 fwinfo_size = 0;
 
        if (priv->bdisable_nic) {
-               RT_TRACE(COMP_ERR,
-                        "%s: ERR!! Nic is disabled! Can't tx packet len=%d qidx=%d!!!\n",
-                        __func__, skb->len, tcb_desc->queue_index);
+               netdev_warn(dev, "%s: Nic is disabled! Can't tx packet.\n",
+                           __func__);
                return skb->len;
        }
 
@@ -2037,10 +1777,10 @@ short rtl8192_tx(struct net_device *dev, struct sk_buff *skb)
 
        pdesc = &ring->desc[idx];
        if ((pdesc->OWN == 1) && (tcb_desc->queue_index != BEACON_QUEUE)) {
-               RT_TRACE(COMP_ERR,
-                        "No more TX desc@%d, ring->idx = %d, idx = %d, skblen = 0x%x queuelen=%d",
-                        tcb_desc->queue_index, ring->idx, idx, skb->len,
-                        skb_queue_len(&ring->queue));
+               netdev_warn(dev,
+                           "No more TX desc@%d, ring->idx = %d, idx = %d, skblen = 0x%x queuelen=%d",
+                           tcb_desc->queue_index, ring->idx, idx, skb->len,
+                           skb_queue_len(&ring->queue));
                spin_unlock_irqrestore(&priv->irq_th_lock, flags);
                return skb->len;
        }
@@ -2055,24 +1795,23 @@ short rtl8192_tx(struct net_device *dev, struct sk_buff *skb)
        spin_unlock_irqrestore(&priv->irq_th_lock, flags);
        dev->trans_start = jiffies;
 
-       write_nic_word(dev, TPPoll, 0x01 << tcb_desc->queue_index);
+       rtl92e_writew(dev, TPPoll, 0x01 << tcb_desc->queue_index);
        return 0;
 }
 
-static short rtl8192_alloc_rx_desc_ring(struct net_device *dev)
+static short _rtl92e_alloc_rx_ring(struct net_device *dev)
 {
        struct r8192_priv *priv = rtllib_priv(dev);
        struct rx_desc *entry = NULL;
        int i, rx_queue_idx;
 
        for (rx_queue_idx = 0; rx_queue_idx < MAX_RX_QUEUE; rx_queue_idx++) {
-               priv->rx_ring[rx_queue_idx] =
-                       pci_zalloc_consistent(priv->pdev,
+               priv->rx_ring[rx_queue_idx] = pci_zalloc_consistent(priv->pdev,
                                              sizeof(*priv->rx_ring[rx_queue_idx]) * priv->rxringcount,
                                              &priv->rx_ring_dma[rx_queue_idx]);
                if (!priv->rx_ring[rx_queue_idx] ||
                    (unsigned long)priv->rx_ring[rx_queue_idx] & 0xFF) {
-                       RT_TRACE(COMP_ERR, "Cannot allocate RX ring\n");
+                       netdev_warn(dev, "Cannot allocate RX ring\n");
                        return -ENOMEM;
                }
 
@@ -2102,14 +1841,14 @@ static short rtl8192_alloc_rx_desc_ring(struct net_device *dev)
                        entry->OWN = 1;
                }
 
-               if(entry)
+               if (entry)
                        entry->EOR = 1;
        }
        return 0;
 }
 
-static int rtl8192_alloc_tx_desc_ring(struct net_device *dev,
-       unsigned int prio, unsigned int entries)
+static int _rtl92e_alloc_tx_ring(struct net_device *dev, unsigned int prio,
+                                unsigned int entries)
 {
        struct r8192_priv *priv = (struct r8192_priv *)rtllib_priv(dev);
        struct tx_desc *ring;
@@ -2118,8 +1857,7 @@ static int rtl8192_alloc_tx_desc_ring(struct net_device *dev,
 
        ring = pci_zalloc_consistent(priv->pdev, sizeof(*ring) * entries, &dma);
        if (!ring || (unsigned long)ring & 0xFF) {
-               RT_TRACE(COMP_ERR, "Cannot allocate TX ring (prio = %d)\n",
-                        prio);
+               netdev_warn(dev, "Cannot allocate TX ring (prio = %d)\n", prio);
                return -ENOMEM;
        }
 
@@ -2137,19 +1875,18 @@ static int rtl8192_alloc_tx_desc_ring(struct net_device *dev,
        return 0;
 }
 
-
-short rtl8192_pci_initdescring(struct net_device *dev)
+static short _rtl92e_pci_initdescring(struct net_device *dev)
 {
        u32 ret;
        int i;
        struct r8192_priv *priv = rtllib_priv(dev);
 
-       ret = rtl8192_alloc_rx_desc_ring(dev);
+       ret = _rtl92e_alloc_rx_ring(dev);
        if (ret)
                return ret;
 
        for (i = 0; i < MAX_TX_QUEUE_COUNT; i++) {
-               ret = rtl8192_alloc_tx_desc_ring(dev, i, priv->txringcount);
+               ret = _rtl92e_alloc_tx_ring(dev, i, priv->txringcount);
                if (ret)
                        goto err_free_rings;
        }
@@ -2157,14 +1894,14 @@ short rtl8192_pci_initdescring(struct net_device *dev)
        return 0;
 
 err_free_rings:
-       rtl8192_free_rx_ring(dev);
+       _rtl92e_free_rx_ring(dev);
        for (i = 0; i < MAX_TX_QUEUE_COUNT; i++)
                if (priv->tx_ring[i].desc)
-                       rtl8192_free_tx_ring(dev, i);
+                       _rtl92e_free_tx_ring(dev, i);
        return 1;
 }
 
-void rtl8192_pci_resetdescring(struct net_device *dev)
+void rtl92e_reset_desc_ring(struct net_device *dev)
 {
        struct r8192_priv *priv = rtllib_priv(dev);
        int i, rx_queue_idx;
@@ -2204,8 +1941,8 @@ void rtl8192_pci_resetdescring(struct net_device *dev)
        spin_unlock_irqrestore(&priv->irq_th_lock, flags);
 }
 
-void rtl819x_UpdateRxPktTimeStamp(struct net_device *dev,
-                                 struct rtllib_rx_stats *stats)
+void rtl92e_update_rx_pkt_timestamp(struct net_device *dev,
+                                   struct rtllib_rx_stats *stats)
 {
        struct r8192_priv *priv = (struct r8192_priv *)rtllib_priv(dev);
 
@@ -2215,7 +1952,7 @@ void rtl819x_UpdateRxPktTimeStamp(struct net_device *dev,
                priv->LastRxDescTSF = stats->mac_time;
 }
 
-long rtl819x_translate_todbm(struct r8192_priv *priv, u8 signal_strength_index)
+long rtl92e_translate_to_dbm(struct r8192_priv *priv, u8 signal_strength_index)
 {
        long    signal_power;
 
@@ -2226,11 +1963,8 @@ long rtl819x_translate_todbm(struct r8192_priv *priv, u8 signal_strength_index)
 }
 
 
-void
-rtl819x_update_rxsignalstatistics8190pci(
-       struct r8192_priv *priv,
-       struct rtllib_rx_stats *pprevious_stats
-       )
+void rtl92e_update_rx_statistics(struct r8192_priv *priv,
+                                struct rtllib_rx_stats *pprevious_stats)
 {
        int weighting = 0;
 
@@ -2249,13 +1983,7 @@ rtl819x_update_rxsignalstatistics8190pci(
                                        weighting) / 6;
 }
 
-void rtl819x_process_cck_rxpathsel(struct r8192_priv *priv,
-                                  struct rtllib_rx_stats *pprevious_stats)
-{
-}
-
-
-u8 rtl819x_query_rxpwrpercentage(char antpower)
+u8 rtl92e_rx_db_to_percent(char antpower)
 {
        if ((antpower <= -100) || (antpower >= 20))
                return  0;
@@ -2266,10 +1994,7 @@ u8 rtl819x_query_rxpwrpercentage(char antpower)
 
 }      /* QueryRxPwrPercentage */
 
-u8
-rtl819x_evm_dbtopercentage(
-       char value
-       )
+u8 rtl92e_evm_db_to_percent(char value)
 {
        char ret_val;
 
@@ -2286,11 +2011,8 @@ rtl819x_evm_dbtopercentage(
        return ret_val;
 }
 
-void
-rtl8192_record_rxdesc_forlateruse(
-       struct rtllib_rx_stats *psrc_stats,
-       struct rtllib_rx_stats *ptarget_stats
-)
+void rtl92e_copy_mpdu_stats(struct rtllib_rx_stats *psrc_stats,
+                           struct rtllib_rx_stats *ptarget_stats)
 {
        ptarget_stats->bIsAMPDU = psrc_stats->bIsAMPDU;
        ptarget_stats->bFirstMPDU = psrc_stats->bFirstMPDU;
@@ -2298,7 +2020,7 @@ rtl8192_record_rxdesc_forlateruse(
 
 
 
-static void rtl8192_rx_normal(struct net_device *dev)
+static void _rtl92e_rx_normal(struct net_device *dev)
 {
        struct r8192_priv *priv = (struct r8192_priv *)rtllib_priv(dev);
        struct rtllib_hdr_1addr *rtllib_hdr = NULL;
@@ -2310,7 +2032,7 @@ static void rtl8192_rx_normal(struct net_device *dev)
 
        struct rtllib_rx_stats stats = {
                .signal = 0,
-               .noise = -98,
+               .noise = (u8) -98,
                .rate = 0,
                .freq = RTLLIB_24GHZ_BAND,
        };
@@ -2404,12 +2126,7 @@ done:
 
 }
 
-static void rtl8192_rx_cmd(struct net_device *dev)
-{
-}
-
-
-static void rtl8192_tx_resume(struct net_device *dev)
+static void _rtl92e_tx_resume(struct net_device *dev)
 {
        struct r8192_priv *priv = (struct r8192_priv *)rtllib_priv(dev);
        struct rtllib_device *ieee = priv->rtllib;
@@ -2426,26 +2143,23 @@ static void rtl8192_tx_resume(struct net_device *dev)
        }
 }
 
-void rtl8192_irq_tx_tasklet(struct r8192_priv *priv)
+static void _rtl92e_irq_tx_tasklet(struct r8192_priv *priv)
 {
-       rtl8192_tx_resume(priv->rtllib->dev);
+       _rtl92e_tx_resume(priv->rtllib->dev);
 }
 
-void rtl8192_irq_rx_tasklet(struct r8192_priv *priv)
+static void _rtl92e_irq_rx_tasklet(struct r8192_priv *priv)
 {
-       rtl8192_rx_normal(priv->rtllib->dev);
-
-       if (MAX_RX_QUEUE > 1)
-               rtl8192_rx_cmd(priv->rtllib->dev);
+       _rtl92e_rx_normal(priv->rtllib->dev);
 
-       write_nic_dword(priv->rtllib->dev, INTA_MASK,
-                       read_nic_dword(priv->rtllib->dev, INTA_MASK) | IMR_RDU);
+       rtl92e_writel(priv->rtllib->dev, INTA_MASK,
+                     rtl92e_readl(priv->rtllib->dev, INTA_MASK) | IMR_RDU);
 }
 
 /****************************************************************************
  ---------------------------- NIC START/CLOSE STUFF---------------------------
 *****************************************************************************/
-void rtl8192_cancel_deferred_work(struct r8192_priv *priv)
+static void _rtl92e_cancel_deferred_work(struct r8192_priv *priv)
 {
        cancel_delayed_work(&priv->watch_dog_wq);
        cancel_delayed_work(&priv->update_beacon_wq);
@@ -2454,38 +2168,36 @@ void rtl8192_cancel_deferred_work(struct r8192_priv *priv)
        cancel_work_sync(&priv->qos_activate);
 }
 
-int _rtl8192_up(struct net_device *dev, bool is_silent_reset)
+static int _rtl92e_up(struct net_device *dev, bool is_silent_reset)
 {
-       if (_rtl8192_sta_up(dev, is_silent_reset) == -1)
+       if (_rtl92e_sta_up(dev, is_silent_reset) == -1)
                return -1;
        return 0;
 }
 
-
-static int rtl8192_open(struct net_device *dev)
+static int _rtl92e_open(struct net_device *dev)
 {
        struct r8192_priv *priv = rtllib_priv(dev);
        int ret;
 
        down(&priv->wx_sem);
-       ret = rtl8192_up(dev);
+       ret = _rtl92e_try_up(dev);
        up(&priv->wx_sem);
        return ret;
 
 }
 
-
-int rtl8192_up(struct net_device *dev)
+static int _rtl92e_try_up(struct net_device *dev)
 {
        struct r8192_priv *priv = rtllib_priv(dev);
 
        if (priv->up == 1)
                return -1;
-       return _rtl8192_up(dev, false);
+       return _rtl92e_up(dev, false);
 }
 
 
-static int rtl8192_close(struct net_device *dev)
+static int _rtl92e_close(struct net_device *dev)
 {
        struct r8192_priv *priv = rtllib_priv(dev);
        int ret;
@@ -2497,7 +2209,7 @@ static int rtl8192_close(struct net_device *dev)
 
        down(&priv->wx_sem);
 
-       ret = rtl8192_down(dev, true);
+       ret = _rtl92e_down(dev, true);
 
        up(&priv->wx_sem);
 
@@ -2505,27 +2217,27 @@ static int rtl8192_close(struct net_device *dev)
 
 }
 
-int rtl8192_down(struct net_device *dev, bool shutdownrf)
+static int _rtl92e_down(struct net_device *dev, bool shutdownrf)
 {
-       if (rtl8192_sta_down(dev, shutdownrf) == -1)
+       if (_rtl92e_sta_down(dev, shutdownrf) == -1)
                return -1;
 
        return 0;
 }
 
-void rtl8192_commit(struct net_device *dev)
+void rtl92e_commit(struct net_device *dev)
 {
        struct r8192_priv *priv = rtllib_priv(dev);
 
        if (priv->up == 0)
                return;
-       rtllib_softmac_stop_protocol(priv->rtllib, 0 , true);
-       rtl8192_irq_disable(dev);
+       rtllib_softmac_stop_protocol(priv->rtllib, 0, true);
+       rtl92e_irq_disable(dev);
        priv->ops->stop_adapter(dev, true);
-       _rtl8192_up(dev, false);
+       _rtl92e_up(dev, false);
 }
 
-void rtl8192_restart(void *data)
+static void _rtl92e_restart(void *data)
 {
        struct r8192_priv *priv = container_of_work_rsl(data, struct r8192_priv,
                                  reset_wq);
@@ -2533,12 +2245,12 @@ void rtl8192_restart(void *data)
 
        down(&priv->wx_sem);
 
-       rtl8192_commit(dev);
+       rtl92e_commit(dev);
 
        up(&priv->wx_sem);
 }
 
-static void r8192_set_multicast(struct net_device *dev)
+static void _rtl92e_set_multicast(struct net_device *dev)
 {
        struct r8192_priv *priv = rtllib_priv(dev);
        short promisc;
@@ -2549,7 +2261,7 @@ static void r8192_set_multicast(struct net_device *dev)
 }
 
 
-static int r8192_set_mac_adr(struct net_device *dev, void *mac)
+static int _rtl92e_set_mac_adr(struct net_device *dev, void *mac)
 {
        struct r8192_priv *priv = rtllib_priv(dev);
        struct sockaddr *addr = mac;
@@ -2565,15 +2277,14 @@ static int r8192_set_mac_adr(struct net_device *dev, void *mac)
 }
 
 /* based on ipw2200 driver */
-static int rtl8192_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)
+static int _rtl92e_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)
 {
        struct r8192_priv *priv = (struct r8192_priv *)rtllib_priv(dev);
        struct iwreq *wrq = (struct iwreq *)rq;
        int ret = -1;
        struct rtllib_device *ieee = priv->rtllib;
        u32 key[4];
-       u8 broadcast_addr[6] = {0xff, 0xff, 0xff, 0xff, 0xff, 0xff};
-       u8 zero_addr[6] = {0};
+       const u8 broadcast_addr[ETH_ALEN] = {0xff, 0xff, 0xff, 0xff, 0xff, 0xff};
        struct iw_point *p = &wrq->u.data;
        struct ieee_param *ipw = NULL;
 
@@ -2610,34 +2321,37 @@ static int rtl8192_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)
                                }
 
                                if (ieee->pairwise_key_type) {
-                                       if (memcmp(ieee->ap_mac_addr, zero_addr,
-                                           6) == 0)
+                                       if (is_zero_ether_addr(ieee->ap_mac_addr))
                                                ieee->iw_mode = IW_MODE_ADHOC;
                                        memcpy((u8 *)key, ipw->u.crypt.key, 16);
-                                       EnableHWSecurityConfig8192(dev);
-                                       set_swcam(dev, 4, ipw->u.crypt.idx,
-                                                 ieee->pairwise_key_type,
-                                                 (u8 *)ieee->ap_mac_addr,
-                                                 0, key, 0);
-                                       setKey(dev, 4, ipw->u.crypt.idx,
-                                              ieee->pairwise_key_type,
-                                              (u8 *)ieee->ap_mac_addr, 0, key);
-                                       if (ieee->iw_mode == IW_MODE_ADHOC) {
-                                               set_swcam(dev, ipw->u.crypt.idx,
-                                                       ipw->u.crypt.idx,
-                                                       ieee->pairwise_key_type,
-                                                       (u8 *)ieee->ap_mac_addr,
-                                                       0, key, 0);
-                                               setKey(dev, ipw->u.crypt.idx,
-                                                      ipw->u.crypt.idx,
+                                       rtl92e_enable_hw_security_config(dev);
+                                       rtl92e_set_swcam(dev, 4,
+                                                        ipw->u.crypt.idx,
+                                                        ieee->pairwise_key_type,
+                                                        (u8 *)ieee->ap_mac_addr,
+                                                        0, key, 0);
+                                       rtl92e_set_key(dev, 4, ipw->u.crypt.idx,
                                                       ieee->pairwise_key_type,
                                                       (u8 *)ieee->ap_mac_addr,
                                                       0, key);
+                                       if (ieee->iw_mode == IW_MODE_ADHOC) {
+                                               rtl92e_set_swcam(dev,
+                                                                ipw->u.crypt.idx,
+                                                                ipw->u.crypt.idx,
+                                                                ieee->pairwise_key_type,
+                                                                (u8 *)ieee->ap_mac_addr,
+                                                                0, key, 0);
+                                               rtl92e_set_key(dev,
+                                                              ipw->u.crypt.idx,
+                                                              ipw->u.crypt.idx,
+                                                              ieee->pairwise_key_type,
+                                                              (u8 *)ieee->ap_mac_addr,
+                                                              0, key);
                                        }
                                }
                                if ((ieee->pairwise_key_type == KEY_TYPE_CCMP)
                                     && ieee->pHTInfo->bCurrentHTSupport) {
-                                       write_nic_byte(dev, 0x173, 1);
+                                       rtl92e_writeb(dev, 0x173, 1);
                                }
 
                        } else {
@@ -2657,14 +2371,15 @@ static int rtl8192_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)
                                        ieee->group_key_type = KEY_TYPE_NA;
 
                                if (ieee->group_key_type) {
-                                       set_swcam(dev, ipw->u.crypt.idx,
-                                                 ipw->u.crypt.idx,
-                                                 ieee->group_key_type,
-                                                 broadcast_addr, 0, key, 0);
-                                       setKey(dev, ipw->u.crypt.idx,
-                                              ipw->u.crypt.idx,
-                                              ieee->group_key_type,
-                                              broadcast_addr, 0, key);
+                                       rtl92e_set_swcam(dev, ipw->u.crypt.idx,
+                                                        ipw->u.crypt.idx,
+                                                        ieee->group_key_type,
+                                                        broadcast_addr, 0, key,
+                                                        0);
+                                       rtl92e_set_key(dev, ipw->u.crypt.idx,
+                                                      ipw->u.crypt.idx,
+                                                      ieee->group_key_type,
+                                                      broadcast_addr, 0, key);
                                }
                        }
                }
@@ -2685,7 +2400,7 @@ out:
 }
 
 
-static irqreturn_t rtl8192_interrupt(int irq, void *netdev)
+static irqreturn_t _rtl92e_irq(int irq, void *netdev)
 {
        struct net_device *dev = (struct net_device *) netdev;
        struct r8192_priv *priv = (struct r8192_priv *)rtllib_priv(dev);
@@ -2736,10 +2451,10 @@ static irqreturn_t rtl8192_interrupt(int irq, void *netdev)
        if (inta  & IMR_MGNTDOK) {
                RT_TRACE(COMP_INTR, "Manage ok interrupt!\n");
                priv->stats.txmanageokint++;
-               rtl8192_tx_isr(dev, MGNT_QUEUE);
+               _rtl92e_tx_isr(dev, MGNT_QUEUE);
                spin_unlock_irqrestore(&priv->irq_th_lock, flags);
                if (priv->rtllib->ack_tx_to_ieee) {
-                       if (rtl8192_is_tx_queue_empty(dev)) {
+                       if (_rtl92e_is_tx_queue_empty(dev)) {
                                priv->rtllib->ack_tx_to_ieee = 0;
                                rtllib_ps_tx_ack(priv->rtllib, 1);
                        }
@@ -2749,11 +2464,11 @@ static irqreturn_t rtl8192_interrupt(int irq, void *netdev)
 
        if (inta & IMR_COMDOK) {
                priv->stats.txcmdpktokint++;
-               rtl8192_tx_isr(dev, TXCMD_QUEUE);
+               _rtl92e_tx_isr(dev, TXCMD_QUEUE);
        }
 
        if (inta & IMR_HIGHDOK)
-               rtl8192_tx_isr(dev, HIGH_QUEUE);
+               _rtl92e_tx_isr(dev, HIGH_QUEUE);
 
        if (inta & IMR_ROK) {
                priv->stats.rxint++;
@@ -2769,8 +2484,8 @@ static irqreturn_t rtl8192_interrupt(int irq, void *netdev)
        if (inta & IMR_RDU) {
                RT_TRACE(COMP_INTR, "rx descriptor unavailable!\n");
                priv->stats.rxrdu++;
-               write_nic_dword(dev, INTA_MASK,
-                               read_nic_dword(dev, INTA_MASK) & ~IMR_RDU);
+               rtl92e_writel(dev, INTA_MASK,
+                             rtl92e_readl(dev, INTA_MASK) & ~IMR_RDU);
                tasklet_schedule(&priv->irq_rx_tasklet);
        }
 
@@ -2787,28 +2502,28 @@ static irqreturn_t rtl8192_interrupt(int irq, void *netdev)
                RT_TRACE(COMP_INTR, "BK Tx OK interrupt!\n");
                priv->stats.txbkokint++;
                priv->rtllib->LinkDetectInfo.NumTxOkInPeriod++;
-               rtl8192_tx_isr(dev, BK_QUEUE);
+               _rtl92e_tx_isr(dev, BK_QUEUE);
        }
 
        if (inta & IMR_BEDOK) {
                RT_TRACE(COMP_INTR, "BE TX OK interrupt!\n");
                priv->stats.txbeokint++;
                priv->rtllib->LinkDetectInfo.NumTxOkInPeriod++;
-               rtl8192_tx_isr(dev, BE_QUEUE);
+               _rtl92e_tx_isr(dev, BE_QUEUE);
        }
 
        if (inta & IMR_VIDOK) {
                RT_TRACE(COMP_INTR, "VI TX OK interrupt!\n");
                priv->stats.txviokint++;
                priv->rtllib->LinkDetectInfo.NumTxOkInPeriod++;
-               rtl8192_tx_isr(dev, VI_QUEUE);
+               _rtl92e_tx_isr(dev, VI_QUEUE);
        }
 
        if (inta & IMR_VODOK) {
                priv->stats.txvookint++;
                RT_TRACE(COMP_INTR, "Vo TX OK interrupt!\n");
                priv->rtllib->LinkDetectInfo.NumTxOkInPeriod++;
-               rtl8192_tx_isr(dev, VO_QUEUE);
+               _rtl92e_tx_isr(dev, VO_QUEUE);
        }
 
        spin_unlock_irqrestore(&priv->irq_th_lock, flags);
@@ -2824,19 +2539,19 @@ done:
        ---------------------------- PCI_STUFF---------------------------
 *****************************************************************************/
 static const struct net_device_ops rtl8192_netdev_ops = {
-       .ndo_open = rtl8192_open,
-       .ndo_stop = rtl8192_close,
-       .ndo_tx_timeout = rtl8192_tx_timeout,
-       .ndo_do_ioctl = rtl8192_ioctl,
-       .ndo_set_rx_mode = r8192_set_multicast,
-       .ndo_set_mac_address = r8192_set_mac_adr,
+       .ndo_open = _rtl92e_open,
+       .ndo_stop = _rtl92e_close,
+       .ndo_tx_timeout = _rtl92e_tx_timeout,
+       .ndo_do_ioctl = _rtl92e_ioctl,
+       .ndo_set_rx_mode = _rtl92e_set_multicast,
+       .ndo_set_mac_address = _rtl92e_set_mac_adr,
        .ndo_validate_addr = eth_validate_addr,
        .ndo_change_mtu = eth_change_mtu,
        .ndo_start_xmit = rtllib_xmit,
 };
 
-static int rtl8192_pci_probe(struct pci_dev *pdev,
-                       const struct pci_device_id *id)
+static int _rtl92e_pci_probe(struct pci_dev *pdev,
+                            const struct pci_device_id *id)
 {
        unsigned long ioaddr = 0;
        struct net_device *dev = NULL;
@@ -2844,13 +2559,12 @@ static int rtl8192_pci_probe(struct pci_dev *pdev,
        struct rtl819x_ops *ops = (struct rtl819x_ops *)(id->driver_data);
        unsigned long pmem_start, pmem_len, pmem_flags;
        int err = -ENOMEM;
-       bool bdma64 = false;
        u8 revision_id;
 
        RT_TRACE(COMP_INIT, "Configuring chip resources");
 
        if (pci_enable_device(pdev)) {
-               RT_TRACE(COMP_ERR, "Failed to enable PCI device");
+               dev_err(&pdev->dev, "Failed to enable PCI device");
                return -EIO;
        }
 
@@ -2868,8 +2582,6 @@ static int rtl8192_pci_probe(struct pci_dev *pdev,
                goto err_pci_disable;
 
        err = -ENODEV;
-       if (bdma64)
-               dev->features |= NETIF_F_HIGHDMA;
 
        pci_set_drvdata(pdev, dev);
        SET_NETDEV_DEV(dev, &pdev->dev);
@@ -2888,21 +2600,21 @@ static int rtl8192_pci_probe(struct pci_dev *pdev,
        pmem_flags = pci_resource_flags(pdev, 1);
 
        if (!(pmem_flags & IORESOURCE_MEM)) {
-               RT_TRACE(COMP_ERR, "region #1 not a MMIO resource, aborting");
+               netdev_err(dev, "region #1 not a MMIO resource, aborting");
                goto err_rel_rtllib;
        }
 
        dev_info(&pdev->dev, "Memory mapped space start: 0x%08lx\n",
                 pmem_start);
        if (!request_mem_region(pmem_start, pmem_len, DRV_NAME)) {
-               RT_TRACE(COMP_ERR, "request_mem_region failed!");
+               netdev_err(dev, "request_mem_region failed!");
                goto err_rel_rtllib;
        }
 
 
        ioaddr = (unsigned long)ioremap_nocache(pmem_start, pmem_len);
        if (ioaddr == (unsigned long)NULL) {
-               RT_TRACE(COMP_ERR, "ioremap failed!");
+               netdev_err(dev, "ioremap failed!");
                goto err_rel_mem;
        }
 
@@ -2912,12 +2624,12 @@ static int rtl8192_pci_probe(struct pci_dev *pdev,
        pci_read_config_byte(pdev, 0x08, &revision_id);
        /* If the revisionid is 0x10, the device uses rtl8192se. */
        if (pdev->device == 0x8192 && revision_id == 0x10)
-               goto err_rel_mem;
+               goto err_unmap;
 
        priv->ops = ops;
 
-       if (rtl8192_pci_findadapter(pdev, dev) == false)
-               goto err_rel_mem;
+       if (rtl92e_check_adapter(pdev, dev) == false)
+               goto err_unmap;
 
        dev->irq = pdev->irq;
        priv->irq = 0;
@@ -2937,8 +2649,8 @@ static int rtl8192_pci_probe(struct pci_dev *pdev,
        }
 
        RT_TRACE(COMP_INIT, "Driver probe completed1\n");
-       if (rtl8192_init(dev) != 0) {
-               RT_TRACE(COMP_ERR, "Initialization failed");
+       if (_rtl92e_init(dev) != 0) {
+               netdev_warn(dev, "Initialization failed");
                goto err_free_irq;
        }
 
@@ -2950,7 +2662,7 @@ static int rtl8192_pci_probe(struct pci_dev *pdev,
        RT_TRACE(COMP_INIT, "dev name: %s\n", dev->name);
 
        if (priv->polling_timer_on == 0)
-               check_rfctrl_gpio_timer((unsigned long)dev);
+               rtl92e_check_rfctrl_gpio_timer((unsigned long)dev);
 
        RT_TRACE(COMP_INIT, "Driver probe completed\n");
        return 0;
@@ -2958,18 +2670,18 @@ static int rtl8192_pci_probe(struct pci_dev *pdev,
 err_free_irq:
        free_irq(dev->irq, dev);
        priv->irq = 0;
+err_unmap:
+       iounmap((void __iomem *)ioaddr);
 err_rel_mem:
        release_mem_region(pmem_start, pmem_len);
 err_rel_rtllib:
        free_rtllib(dev);
-
-       DMESG("wlan driver load failed\n");
 err_pci_disable:
        pci_disable_device(pdev);
        return err;
 }
 
-static void rtl8192_pci_disconnect(struct pci_dev *pdev)
+static void _rtl92e_pci_disconnect(struct pci_dev *pdev)
 {
        struct net_device *dev = pci_get_drvdata(pdev);
        struct r8192_priv *priv;
@@ -2983,16 +2695,16 @@ static void rtl8192_pci_disconnect(struct pci_dev *pdev)
                del_timer_sync(&priv->gpio_polling_timer);
                cancel_delayed_work(&priv->gpio_change_rf_wq);
                priv->polling_timer_on = 0;
-               rtl8192_down(dev, true);
-               deinit_hal_dm(dev);
+               _rtl92e_down(dev, true);
+               rtl92e_dm_deinit(dev);
                if (priv->pFirmware) {
                        vfree(priv->pFirmware);
                        priv->pFirmware = NULL;
                }
                destroy_workqueue(priv->priv_wq);
-               rtl8192_free_rx_ring(dev);
+               _rtl92e_free_rx_ring(dev);
                for (i = 0; i < MAX_TX_QUEUE_COUNT; i++)
-                       rtl8192_free_tx_ring(dev, i);
+                       _rtl92e_free_tx_ring(dev, i);
 
                if (priv->irq) {
                        dev_info(&pdev->dev, "Freeing irq %d\n", dev->irq);
@@ -3001,8 +2713,6 @@ static void rtl8192_pci_disconnect(struct pci_dev *pdev)
                }
                free_rtllib(dev);
 
-               kfree(priv->scan_cmd);
-
                if (dev->mem_start != 0) {
                        iounmap((void __iomem *)dev->mem_start);
                        release_mem_region(pci_resource_start(pdev, 1),
@@ -3016,7 +2726,7 @@ static void rtl8192_pci_disconnect(struct pci_dev *pdev)
        RT_TRACE(COMP_DOWN, "wlan driver removed\n");
 }
 
-bool NicIFEnableNIC(struct net_device *dev)
+bool rtl92e_enable_nic(struct net_device *dev)
 {
        bool init_status = true;
        struct r8192_priv *priv = rtllib_priv(dev);
@@ -3024,8 +2734,7 @@ bool NicIFEnableNIC(struct net_device *dev)
                                        (&(priv->rtllib->PowerSaveControl));
 
        if (!priv->up) {
-               RT_TRACE(COMP_ERR, "ERR!!! %s(): Driver is already down!\n",
-                        __func__);
+               netdev_warn(dev, "%s(): Driver is already down!\n", __func__);
                priv->bdisable_nic = false;
                return false;
        }
@@ -3034,8 +2743,7 @@ bool NicIFEnableNIC(struct net_device *dev)
        priv->bfirst_init = true;
        init_status = priv->ops->initialize_adapter(dev);
        if (!init_status) {
-               RT_TRACE(COMP_ERR, "ERR!!! %s(): initialization is failed!\n",
-                        __func__);
+               netdev_warn(dev, "%s(): Initialization failed!\n", __func__);
                priv->bdisable_nic = false;
                return false;
        }
@@ -3043,12 +2751,12 @@ bool NicIFEnableNIC(struct net_device *dev)
        RT_CLEAR_PS_LEVEL(pPSC, RT_RF_OFF_LEVL_HALT_NIC);
        priv->bfirst_init = false;
 
-       rtl8192_irq_enable(dev);
+       rtl92e_irq_enable(dev);
        priv->bdisable_nic = false;
        RT_TRACE(COMP_PS, "<===========%s()\n", __func__);
        return init_status;
 }
-bool NicIFDisableNIC(struct net_device *dev)
+bool rtl92e_disable_nic(struct net_device *dev)
 {
        struct r8192_priv *priv = rtllib_priv(dev);
        u8 tmp_state = 0;
@@ -3058,8 +2766,8 @@ bool NicIFDisableNIC(struct net_device *dev)
        tmp_state = priv->rtllib->state;
        rtllib_softmac_stop_protocol(priv->rtllib, 0, false);
        priv->rtllib->state = tmp_state;
-       rtl8192_cancel_deferred_work(priv);
-       rtl8192_irq_disable(dev);
+       _rtl92e_cancel_deferred_work(priv);
+       rtl92e_irq_disable(dev);
 
        priv->ops->stop_adapter(dev, false);
        RT_TRACE(COMP_PS, "<=========%s()\n", __func__);
@@ -3067,27 +2775,9 @@ bool NicIFDisableNIC(struct net_device *dev)
        return true;
 }
 
-static int __init rtl8192_pci_module_init(void)
-{
-       pr_info("\nLinux kernel driver for RTL8192E WLAN cards\n");
-       pr_info("Copyright (c) 2007-2008, Realsil Wlan Driver\n");
+module_pci_driver(rtl8192_pci_driver);
 
-       if (0 != pci_register_driver(&rtl8192_pci_driver)) {
-               DMESG("No device found");
-               /*pci_unregister_driver (&rtl8192_pci_driver);*/
-               return -ENODEV;
-       }
-       return 0;
-}
-
-static void __exit rtl8192_pci_module_exit(void)
-{
-       pci_unregister_driver(&rtl8192_pci_driver);
-
-       RT_TRACE(COMP_DOWN, "Exiting");
-}
-
-void check_rfctrl_gpio_timer(unsigned long data)
+void rtl92e_check_rfctrl_gpio_timer(unsigned long data)
 {
        struct r8192_priv *priv = rtllib_priv((struct net_device *)data);
 
@@ -3102,9 +2792,6 @@ void check_rfctrl_gpio_timer(unsigned long data)
 /***************************************************************************
        ------------------- module init / exit stubs ----------------
 ****************************************************************************/
-module_init(rtl8192_pci_module_init);
-module_exit(rtl8192_pci_module_exit);
-
 MODULE_DESCRIPTION("Linux driver for Realtek RTL819x WiFi cards");
 MODULE_AUTHOR(DRV_COPYRIGHT " " DRV_AUTHOR);
 MODULE_VERSION(DRV_VERSION);