staging: rtl8192e: Simplify rtl819x_ifcheck_resetornot
[pandora-kernel.git] / drivers / staging / rtl8192e / r8192E_core.c
index 92c1910..eb956ea 100644 (file)
@@ -1,6 +1,6 @@
 /******************************************************************************
  * Copyright(c) 2008 - 2010 Realtek Corporation. All rights reserved.
- * Linux device driver for RTL8190P / RTL8192E
+ * Linux device driver for RTL8192E
  *
  * Based on the r8180 driver, which is:
  * Copyright 2004-2005 Andrea Merello <andreamrl@tiscali.it>, et al.
  */
 
 
-#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
-
-//#define CONFIG_RTL8192_IO_MAP
 #include <linux/vmalloc.h>
 #include <linux/slab.h>
 #include <asm/uaccess.h>
 #endif
 
 //set here to open your trace code. //WB
-u32 rt_global_debug_component =
-               //              COMP_INIT       |
-                       //      COMP_EPROM      |
-               //              COMP_PHY        |
-               //              COMP_RF         |
-//                             COMP_FIRMWARE   |
-                       //      COMP_TRACE      |
-               //              COMP_DOWN       |
-               //              COMP_SWBW       |
-               //              COMP_SEC        |
-//                             COMP_QOS        |
-//                             COMP_RATE       |
-               //              COMP_RECV       |
-               //              COMP_SEND       |
-               //              COMP_POWER      |
-                       //      COMP_EVENTS     |
-                       //      COMP_RESET      |
-                       //      COMP_CMDPKT     |
-                       //      COMP_POWER_TRACKING     |
-                        //     COMP_INTR       |
-                               COMP_ERR ; //always open err flags on
+u32 rt_global_debug_component = COMP_ERR ; //always open err flags on
 
 static DEFINE_PCI_DEVICE_TABLE(rtl8192_pci_id_tbl) = {
-#ifdef RTL8190P
-       /* Realtek */
-       /* Dlink */
-       { PCI_DEVICE(0x10ec, 0x8190) },
-       /* Corega */
-       { PCI_DEVICE(0x07aa, 0x0045) },
-       { PCI_DEVICE(0x07aa, 0x0046) },
-#else
        /* Realtek */
        { PCI_DEVICE(0x10ec, 0x8192) },
 
        /* Corega */
        { PCI_DEVICE(0x07aa, 0x0044) },
        { PCI_DEVICE(0x07aa, 0x0047) },
-#endif
        {}
 };
 
@@ -148,16 +99,17 @@ static struct pci_driver rtl8192_pci_driver = {
 static void rtl8192_start_beacon(struct net_device *dev);
 static void rtl8192_stop_beacon(struct net_device *dev);
 static void rtl819x_watchdog_wqcallback(struct work_struct *work);
-static void rtl8192_irq_rx_tasklet(struct r8192_priv *priv);
-static void rtl8192_irq_tx_tasklet(struct r8192_priv *priv);
-static void rtl8192_prepare_beacon(struct r8192_priv *priv);
+static void rtl8192_irq_rx_tasklet(unsigned long arg);
+static void rtl8192_irq_tx_tasklet(unsigned long arg);
+static void rtl8192_prepare_beacon(unsigned long arg);
 static irqreturn_t rtl8192_interrupt(int irq, void *netdev);
-static void rtl819xE_tx_cmd(struct net_device *dev, struct sk_buff *skb);
-static void rtl8192_update_ratr_table(struct net_device* dev);
+static void rtl819xE_tx_cmd(struct r8192_priv *priv, struct sk_buff *skb);
+static void rtl8192_update_ratr_table(struct r8192_priv *priv);
 static void rtl8192_restart(struct work_struct *work);
 static void watch_dog_timer_callback(unsigned long data);
-static int _rtl8192_up(struct net_device *dev);
+static int _rtl8192_up(struct r8192_priv *priv);
 static void rtl8192_cancel_deferred_work(struct r8192_priv* priv);
+static short rtl8192_tx(struct r8192_priv *priv, struct sk_buff* skb);
 
 #ifdef ENABLE_DOT11D
 
@@ -201,15 +153,9 @@ static void rtl819x_set_channel_map(u8 channel_plan, struct r8192_priv* priv)
                        Dot11d_Init(ieee);
                        ieee->bGlobalDomain = false;
                         //acturally 8225 & 8256 rf chip only support B,G,24N mode
-                        if ((priv->rf_chip == RF_8225) || (priv->rf_chip == RF_8256))
-                       {
-                               min_chan = 1;
-                               max_chan = 14;
-                       }
-                       else
-                       {
-                               RT_TRACE(COMP_ERR, "unknown rf chip, can't set channel map in function:%s()\n", __FUNCTION__);
-                       }
+                       min_chan = 1;
+                       max_chan = 14;
+
                        if (ChannelPlan[channel_plan].Len != 0){
                                // Clear old channel map
                                memset(GET_DOT11D_INFO(ieee)->channel_map, 0, sizeof(GET_DOT11D_INFO(ieee)->channel_map));
@@ -245,92 +191,56 @@ static inline bool rx_hal_is_cck_rate(prx_fwinfo_819x_pci pdrvinfo)
                !pdrvinfo->RxHT;
 }
 
-void CamResetAllEntry(struct net_device *dev)
-{
-       write_nic_dword(dev, RWCAM, BIT31|BIT30);
-}
-
-
-void write_cam(struct net_device *dev, u8 addr, u32 data)
-{
-        write_nic_dword(dev, WCAMI, data);
-        write_nic_dword(dev, RWCAM, BIT31|BIT16|(addr&0xff) );
-}
-u32 read_cam(struct net_device *dev, u8 addr)
-{
-        write_nic_dword(dev, RWCAM, 0x80000000|(addr&0xff) );
-        return read_nic_dword(dev, 0xa8);
-}
-
-#ifdef CONFIG_RTL8180_IO_MAP
-
-u8 read_nic_byte(struct net_device *dev, int x)
-{
-        return 0xff&inb(dev->base_addr +x);
-}
-
-u32 read_nic_dword(struct net_device *dev, int x)
-{
-        return inl(dev->base_addr +x);
-}
-
-u16 read_nic_word(struct net_device *dev, int x)
-{
-        return inw(dev->base_addr +x);
-}
-
-void write_nic_byte(struct net_device *dev, int x,u8 y)
+void CamResetAllEntry(struct r8192_priv* priv)
 {
-        outb(y&0xff,dev->base_addr +x);
+       write_nic_dword(priv, RWCAM, BIT31|BIT30);
 }
 
-void write_nic_word(struct net_device *dev, int x,u16 y)
+void write_cam(struct r8192_priv *priv, u8 addr, u32 data)
 {
-        outw(y,dev->base_addr +x);
+        write_nic_dword(priv, WCAMI, data);
+        write_nic_dword(priv, RWCAM, BIT31|BIT16|(addr&0xff) );
 }
 
-void write_nic_dword(struct net_device *dev, int x,u32 y)
+u32 read_cam(struct r8192_priv *priv, u8 addr)
 {
-        outl(y,dev->base_addr +x);
+        write_nic_dword(priv, RWCAM, 0x80000000|(addr&0xff) );
+        return read_nic_dword(priv, 0xa8);
 }
 
-#else /* RTL_IO_MAP */
-
-u8 read_nic_byte(struct net_device *dev, int x)
+u8 read_nic_byte(struct r8192_priv *priv, int x)
 {
-        return 0xff&readb((u8*)dev->mem_start +x);
+        return 0xff & readb(priv->mem_start + x);
 }
 
-u32 read_nic_dword(struct net_device *dev, int x)
+u32 read_nic_dword(struct r8192_priv *priv, int x)
 {
-        return readl((u8*)dev->mem_start +x);
+        return readl(priv->mem_start + x);
 }
 
-u16 read_nic_word(struct net_device *dev, int x)
+u16 read_nic_word(struct r8192_priv *priv, int x)
 {
-        return readw((u8*)dev->mem_start +x);
+        return readw(priv->mem_start + x);
 }
 
-void write_nic_byte(struct net_device *dev, int x,u8 y)
+void write_nic_byte(struct r8192_priv *priv, int x,u8 y)
 {
-        writeb(y,(u8*)dev->mem_start +x);
+        writeb(y, priv->mem_start + x);
        udelay(20);
 }
 
-void write_nic_dword(struct net_device *dev, int x,u32 y)
+void write_nic_dword(struct r8192_priv *priv, int x,u32 y)
 {
-        writel(y,(u8*)dev->mem_start +x);
+        writel(y, priv->mem_start + x);
        udelay(20);
 }
 
-void write_nic_word(struct net_device *dev, int x,u16 y)
+void write_nic_word(struct r8192_priv *priv, int x,u16 y)
 {
-        writew(y,(u8*)dev->mem_start +x);
+        writew(y, priv->mem_start + x);
        udelay(20);
 }
 
-#endif /* RTL_IO_MAP */
-
 u8 rtl8192e_ap_sec_type(struct ieee80211_device *ieee)
 {
        static const u8 ccmp_ie[4] = {0x00,0x50,0xf2,0x04};
@@ -370,14 +280,14 @@ rtl8192e_SetHwReg(struct net_device *dev,u8 variable,u8* val)
        {
 
                case HW_VAR_BSSID:
-                       write_nic_dword(dev, BSSIDR, ((u32*)(val))[0]);
-                       write_nic_word(dev, BSSIDR+2, ((u16*)(val+2))[0]);
+                       write_nic_dword(priv, BSSIDR, ((u32*)(val))[0]);
+                       write_nic_word(priv, BSSIDR+2, ((u16*)(val+2))[0]);
                break;
 
                case HW_VAR_MEDIA_STATUS:
                {
                        RT_OP_MODE      OpMode = *((RT_OP_MODE *)(val));
-                       u8              btMsr = read_nic_byte(dev, MSR);
+                       u8              btMsr = read_nic_byte(priv, MSR);
 
                        btMsr &= 0xfc;
 
@@ -400,7 +310,7 @@ rtl8192e_SetHwReg(struct net_device *dev,u8 variable,u8* val)
                                break;
                        }
 
-                       write_nic_byte(dev, MSR, btMsr);
+                       write_nic_byte(priv, MSR, btMsr);
                }
                break;
 
@@ -409,7 +319,7 @@ rtl8192e_SetHwReg(struct net_device *dev,u8 variable,u8* val)
                        u32     RegRCR, Type;
 
                        Type = ((u8*)(val))[0];
-                       RegRCR = read_nic_dword(dev,RCR);
+                       RegRCR = read_nic_dword(priv, RCR);
                        priv->ReceiveConfig = RegRCR;
 
                        if (Type == true)
@@ -417,7 +327,7 @@ rtl8192e_SetHwReg(struct net_device *dev,u8 variable,u8* val)
                        else if (Type == false)
                                RegRCR &= (~RCR_CBSSID);
 
-                       write_nic_dword(dev, RCR,RegRCR);
+                       write_nic_dword(priv, RCR,RegRCR);
                        priv->ReceiveConfig = RegRCR;
 
                }
@@ -426,7 +336,7 @@ rtl8192e_SetHwReg(struct net_device *dev,u8 variable,u8* val)
                case HW_VAR_SLOT_TIME:
                {
                        priv->slot_time = val[0];
-                       write_nic_byte(dev, SLOT_TIME, val[0]);
+                       write_nic_byte(priv, SLOT_TIME, val[0]);
 
                }
                break;
@@ -438,12 +348,12 @@ rtl8192e_SetHwReg(struct net_device *dev,u8 variable,u8* val)
                        regTmp = priv->basic_rate;
                        if (priv->short_preamble)
                                regTmp |= BRSR_AckShortPmb;
-                       write_nic_dword(dev, RRSR, regTmp);
+                       write_nic_dword(priv, RRSR, regTmp);
                }
                break;
 
                case HW_VAR_CPU_RST:
-                       write_nic_dword(dev, CPU_GEN, ((u32*)(val))[0]);
+                       write_nic_dword(priv, CPU_GEN, ((u32*)(val))[0]);
                break;
 
                default:
@@ -458,8 +368,7 @@ static int proc_get_stats_ap(char *page, char **start,
                          off_t offset, int count,
                          int *eof, void *data)
 {
-       struct net_device *dev = data;
-       struct r8192_priv *priv = (struct r8192_priv *)ieee80211_priv(dev);
+       struct r8192_priv *priv = data;
        struct ieee80211_device *ieee = priv->ieee80211;
        struct ieee80211_network *target;
        int len = 0;
@@ -488,7 +397,7 @@ static int proc_get_registers(char *page, char **start,
                          off_t offset, int count,
                          int *eof, void *data)
 {
-       struct net_device *dev = data;
+       struct r8192_priv *priv = data;
        int len = 0;
        int i,n;
        int max=0xff;
@@ -504,7 +413,7 @@ static int proc_get_registers(char *page, char **start,
 
                for(i=0;i<16 && n<=max;i++,n++)
                len += snprintf(page + len, count - len,
-                       "%2x ",read_nic_byte(dev,n));
+                       "%2x ",read_nic_byte(priv,n));
        }
        len += snprintf(page + len, count - len,"\n");
        len += snprintf(page + len, count - len,
@@ -516,7 +425,7 @@ static int proc_get_registers(char *page, char **start,
 
                 for(i=0;i<16 && n<=max;i++,n++)
                 len += snprintf(page + len, count - len,
-                        "%2x ",read_nic_byte(dev,0x100|n));
+                        "%2x ",read_nic_byte(priv,0x100|n));
         }
 
        len += snprintf(page + len, count - len,
@@ -528,7 +437,7 @@ static int proc_get_registers(char *page, char **start,
 
                 for(i=0;i<16 && n<=max;i++,n++)
                 len += snprintf(page + len, count - len,
-                        "%2x ",read_nic_byte(dev,0x300|n));
+                        "%2x ",read_nic_byte(priv,0x300|n));
         }
 
        *eof = 1;
@@ -540,8 +449,7 @@ static int proc_get_stats_tx(char *page, char **start,
                          off_t offset, int count,
                          int *eof, void *data)
 {
-       struct net_device *dev = data;
-       struct r8192_priv *priv = (struct r8192_priv *)ieee80211_priv(dev);
+       struct r8192_priv *priv = data;
 
        int len = 0;
 
@@ -566,7 +474,7 @@ static int proc_get_stats_tx(char *page, char **start,
                priv->stats.txbeaconokint,
                priv->stats.txbeaconerr,
                priv->stats.txcmdpktokint,
-               netif_queue_stopped(dev),
+               netif_queue_stopped(priv->ieee80211->dev),
                priv->stats.txoverflow,
                priv->ieee80211->stats.tx_packets,
                priv->ieee80211->stats.tx_bytes);
@@ -581,9 +489,7 @@ static int proc_get_stats_rx(char *page, char **start,
                          off_t offset, int count,
                          int *eof, void *data)
 {
-       struct net_device *dev = data;
-       struct r8192_priv *priv = (struct r8192_priv *)ieee80211_priv(dev);
-
+       struct r8192_priv *priv = data;
        int len = 0;
 
        len += snprintf(page + len, count - len,
@@ -600,7 +506,7 @@ static int proc_get_stats_rx(char *page, char **start,
 
 static void rtl8192_proc_module_init(void)
 {
-       RT_TRACE(COMP_INIT, "Initializing proc filesystem");
+       RT_TRACE(COMP_INIT, "Initializing proc filesystem\n");
        rtl8192_proc=create_proc_entry(RTL819xE_MODULE_NAME, S_IFDIR, init_net.proc_net);
 }
 
@@ -611,32 +517,28 @@ static void rtl8192_proc_module_remove(void)
 }
 
 
-static void rtl8192_proc_remove_one(struct net_device *dev)
+static void rtl8192_proc_remove_one(struct r8192_priv *priv)
 {
-       struct r8192_priv *priv = (struct r8192_priv *)ieee80211_priv(dev);
+       struct net_device *dev = priv->ieee80211->dev;
 
        printk("dev name=======> %s\n",dev->name);
 
        if (priv->dir_dev) {
-       //      remove_proc_entry("stats-hw", priv->dir_dev);
                remove_proc_entry("stats-tx", priv->dir_dev);
                remove_proc_entry("stats-rx", priv->dir_dev);
-       //      remove_proc_entry("stats-ieee", priv->dir_dev);
                remove_proc_entry("stats-ap", priv->dir_dev);
                remove_proc_entry("registers", priv->dir_dev);
-       //      remove_proc_entry("cck-registers",priv->dir_dev);
-       //      remove_proc_entry("ofdm-registers",priv->dir_dev);
-               //remove_proc_entry(dev->name, rtl8192_proc);
                remove_proc_entry("wlan0", rtl8192_proc);
                priv->dir_dev = NULL;
        }
 }
 
 
-static void rtl8192_proc_init_one(struct net_device *dev)
+static void rtl8192_proc_init_one(struct r8192_priv *priv)
 {
+       struct net_device *dev = priv->ieee80211->dev;
        struct proc_dir_entry *e;
-       struct r8192_priv *priv = (struct r8192_priv *)ieee80211_priv(dev);
+
        priv->dir_dev = create_proc_entry(dev->name,
                                          S_IFDIR | S_IRUGO | S_IXUGO,
                                          rtl8192_proc);
@@ -646,7 +548,7 @@ static void rtl8192_proc_init_one(struct net_device *dev)
                return;
        }
        e = create_proc_read_entry("stats-rx", S_IFREG | S_IRUGO,
-                                  priv->dir_dev, proc_get_stats_rx, dev);
+                                  priv->dir_dev, proc_get_stats_rx, priv);
 
        if (!e) {
                RT_TRACE(COMP_ERR,"Unable to initialize "
@@ -656,7 +558,7 @@ static void rtl8192_proc_init_one(struct net_device *dev)
 
 
        e = create_proc_read_entry("stats-tx", S_IFREG | S_IRUGO,
-                                  priv->dir_dev, proc_get_stats_tx, dev);
+                                  priv->dir_dev, proc_get_stats_tx, priv);
 
        if (!e) {
                RT_TRACE(COMP_ERR, "Unable to initialize "
@@ -665,7 +567,7 @@ static void rtl8192_proc_init_one(struct net_device *dev)
        }
 
        e = create_proc_read_entry("stats-ap", S_IFREG | S_IRUGO,
-                                  priv->dir_dev, proc_get_stats_ap, dev);
+                                  priv->dir_dev, proc_get_stats_ap, priv);
 
        if (!e) {
                RT_TRACE(COMP_ERR, "Unable to initialize "
@@ -674,7 +576,7 @@ static void rtl8192_proc_init_one(struct net_device *dev)
        }
 
        e = create_proc_read_entry("registers", S_IFREG | S_IRUGO,
-                                  priv->dir_dev, proc_get_registers, dev);
+                                  priv->dir_dev, proc_get_registers, priv);
        if (!e) {
                RT_TRACE(COMP_ERR, "Unable to initialize "
                      "/proc/net/rtl8192/%s/registers\n",
@@ -682,7 +584,7 @@ static void rtl8192_proc_init_one(struct net_device *dev)
        }
 }
 
-short check_nic_enough_desc(struct net_device *dev, int prio)
+static short check_nic_enough_desc(struct net_device *dev, int prio)
 {
     struct r8192_priv *priv = ieee80211_priv(dev);
     struct rtl8192_tx_ring *ring = &priv->tx_ring[prio];
@@ -701,27 +603,29 @@ static void tx_timeout(struct net_device *dev)
        printk("TXTIMEOUT");
 }
 
-static void rtl8192_irq_enable(struct net_device *dev)
+static void rtl8192_irq_enable(struct r8192_priv *priv)
 {
-       struct r8192_priv *priv = (struct r8192_priv *)ieee80211_priv(dev);
-       priv->irq_enabled = 1;
-       write_nic_dword(dev,INTA_MASK, priv->irq_mask);
+       u32 mask;
+
+       mask = IMR_ROK | IMR_VODOK | IMR_VIDOK | IMR_BEDOK | IMR_BKDOK |
+              IMR_HCCADOK | IMR_MGNTDOK | IMR_COMDOK | IMR_HIGHDOK |
+              IMR_BDOK | IMR_RXCMDOK | IMR_TIMEOUT0 | IMR_RDU | IMR_RXFOVW |
+              IMR_TXFOVW | IMR_BcnInt | IMR_TBDOK | IMR_TBDER;
+
+       write_nic_dword(priv, INTA_MASK, mask);
 }
 
-void rtl8192_irq_disable(struct net_device *dev)
+static void rtl8192_irq_disable(struct r8192_priv *priv)
 {
-       struct r8192_priv *priv = (struct r8192_priv *)ieee80211_priv(dev);
-
-       write_nic_dword(dev,INTA_MASK,0);
-       priv->irq_enabled = 0;
+       write_nic_dword(priv, INTA_MASK, 0);
+       synchronize_irq(priv->irq);
 }
 
-void rtl8192_update_msr(struct net_device *dev)
+static void rtl8192_update_msr(struct r8192_priv *priv)
 {
-       struct r8192_priv *priv = ieee80211_priv(dev);
        u8 msr;
 
-       msr  = read_nic_byte(dev, MSR);
+       msr  = read_nic_byte(priv, MSR);
        msr &= ~ MSR_LINK_MASK;
 
        /* do not change in link_state != WLAN_LINK_ASSOCIATED.
@@ -741,10 +645,10 @@ void rtl8192_update_msr(struct net_device *dev)
        }else
                msr |= (MSR_LINK_NONE<<MSR_LINK_SHIFT);
 
-       write_nic_byte(dev, MSR, msr);
+       write_nic_byte(priv, MSR, msr);
 }
 
-void rtl8192_set_chan(struct net_device *dev,short ch)
+static void rtl8192_set_chan(struct net_device *dev,short ch)
 {
        struct r8192_priv *priv = (struct r8192_priv *)ieee80211_priv(dev);
 
@@ -756,11 +660,9 @@ void rtl8192_set_chan(struct net_device *dev,short ch)
                priv->rf_set_chan(dev, priv->chan);
 }
 
-void rtl8192_rx_enable(struct net_device *dev)
+static void rtl8192_rx_enable(struct r8192_priv *priv)
 {
-       struct r8192_priv *priv = (struct r8192_priv *)ieee80211_priv(dev);
-
-       write_nic_dword(dev, RDQDA,priv->rx_ring_dma);
+       write_nic_dword(priv, RDQDA, priv->rx_ring_dma);
 }
 
 /* the TX_DESC_BASE setting is according to the following queue index
@@ -775,21 +677,19 @@ void rtl8192_rx_enable(struct net_device *dev)
  *  BEACON_QUEUE   ===>                        8
  *  */
 static const u32 TX_DESC_BASE[] = {BKQDA, BEQDA, VIQDA, VOQDA, HCCAQDA, CQDA, MQDA, HQDA, BQDA};
-void rtl8192_tx_enable(struct net_device *dev)
+static void rtl8192_tx_enable(struct r8192_priv *priv)
 {
-       struct r8192_priv *priv = (struct r8192_priv *)ieee80211_priv(dev);
        u32 i;
 
        for (i = 0; i < MAX_TX_QUEUE_COUNT; i++)
-               write_nic_dword(dev, TX_DESC_BASE[i], priv->tx_ring[i].dma);
+               write_nic_dword(priv, TX_DESC_BASE[i], priv->tx_ring[i].dma);
 
        ieee80211_reset_queue(priv->ieee80211);
 }
 
 
-static void rtl8192_free_rx_ring(struct net_device *dev)
+static void rtl8192_free_rx_ring(struct r8192_priv *priv)
 {
-       struct r8192_priv *priv = ieee80211_priv(dev);
        int i;
 
        for (i = 0; i < priv->rxringcount; i++) {
@@ -808,9 +708,8 @@ static void rtl8192_free_rx_ring(struct net_device *dev)
        priv->rx_ring = NULL;
 }
 
-static void rtl8192_free_tx_ring(struct net_device *dev, unsigned int prio)
+static void rtl8192_free_tx_ring(struct r8192_priv *priv, unsigned int prio)
 {
-       struct r8192_priv *priv = ieee80211_priv(dev);
        struct rtl8192_tx_ring *ring = &priv->tx_ring[prio];
 
        while (skb_queue_len(&ring->queue)) {
@@ -828,29 +727,28 @@ static void rtl8192_free_tx_ring(struct net_device *dev, unsigned int prio)
        ring->desc = NULL;
 }
 
-void PHY_SetRtl8192eRfOff(struct net_device* dev)
+void PHY_SetRtl8192eRfOff(struct r8192_priv *priv)
 {
        //disable RF-Chip A/B
-       rtl8192_setBBreg(dev, rFPGA0_XA_RFInterfaceOE, BIT4, 0x0);
+       rtl8192_setBBreg(priv, rFPGA0_XA_RFInterfaceOE, BIT4, 0x0);
        //analog to digital off, for power save
-       rtl8192_setBBreg(dev, rFPGA0_AnalogParameter4, 0x300, 0x0);
+       rtl8192_setBBreg(priv, rFPGA0_AnalogParameter4, 0x300, 0x0);
        //digital to analog off, for power save
-       rtl8192_setBBreg(dev, rFPGA0_AnalogParameter1, 0x18, 0x0);
+       rtl8192_setBBreg(priv, rFPGA0_AnalogParameter1, 0x18, 0x0);
        //rx antenna off
-       rtl8192_setBBreg(dev, rOFDM0_TRxPathEnable, 0xf, 0x0);
+       rtl8192_setBBreg(priv, rOFDM0_TRxPathEnable, 0xf, 0x0);
        //rx antenna off
-       rtl8192_setBBreg(dev, rOFDM1_TRxPathEnable, 0xf, 0x0);
+       rtl8192_setBBreg(priv, rOFDM1_TRxPathEnable, 0xf, 0x0);
        //analog to digital part2 off, for power save
-       rtl8192_setBBreg(dev, rFPGA0_AnalogParameter1, 0x60, 0x0);
-       rtl8192_setBBreg(dev, rFPGA0_AnalogParameter1, 0x4, 0x0);
+       rtl8192_setBBreg(priv, rFPGA0_AnalogParameter1, 0x60, 0x0);
+       rtl8192_setBBreg(priv, rFPGA0_AnalogParameter1, 0x4, 0x0);
        // Analog parameter!!Change bias and Lbus control.
-       write_nic_byte(dev, ANAPAR_FOR_8192PciE, 0x07);
-
+       write_nic_byte(priv, ANAPAR_FOR_8192PciE, 0x07);
 }
 
-void rtl8192_halt_adapter(struct net_device *dev, bool reset)
+static void rtl8192_halt_adapter(struct r8192_priv *priv, bool reset)
 {
-       struct r8192_priv *priv = ieee80211_priv(dev);
+       struct net_device *dev = priv->ieee80211->dev;
        int i;
        u8 OpMode;
        u32 ulRegRead;
@@ -863,7 +761,7 @@ void rtl8192_halt_adapter(struct net_device *dev, bool reset)
                 * disable tx/rx. In 8185 we write 0x10 (Reset bit),
                 * but here we make reference to WMAC and wirte 0x0
                 */
-               write_nic_byte(dev, CMDR, 0);
+               write_nic_byte(priv, CMDR, 0);
        }
 
        mdelay(20);
@@ -871,29 +769,27 @@ void rtl8192_halt_adapter(struct net_device *dev, bool reset)
        if (!reset) {
                mdelay(150);
 
-#ifdef RTL8192E
                priv->bHwRfOffAction = 2;
-#endif
 
                /*
                 * Call MgntActSet_RF_State instead to
                 * prevent RF config race condition.
                 */
                if (!priv->ieee80211->bSupportRemoteWakeUp) {
-                       PHY_SetRtl8192eRfOff(dev);
-                       ulRegRead = read_nic_dword(dev,CPU_GEN);
+                       PHY_SetRtl8192eRfOff(priv);
+                       ulRegRead = read_nic_dword(priv, CPU_GEN);
                        ulRegRead |= CPU_GEN_SYSTEM_RESET;
-                       write_nic_dword(dev,CPU_GEN, ulRegRead);
+                       write_nic_dword(priv,CPU_GEN, ulRegRead);
                } else {
                        /* for WOL */
-                       write_nic_dword(dev, WFCRC0, 0xffffffff);
-                       write_nic_dword(dev, WFCRC1, 0xffffffff);
-                       write_nic_dword(dev, WFCRC2, 0xffffffff);
+                       write_nic_dword(priv, WFCRC0, 0xffffffff);
+                       write_nic_dword(priv, WFCRC1, 0xffffffff);
+                       write_nic_dword(priv, WFCRC2, 0xffffffff);
 
                        /* Write PMR register */
-                       write_nic_byte(dev, PMR, 0x5);
+                       write_nic_byte(priv, PMR, 0x5);
                        /* Disable tx, enanble rx */
-                       write_nic_byte(dev, MacBlkCtrl, 0xa);
+                       write_nic_byte(priv, MacBlkCtrl, 0xa);
                }
        }
 
@@ -907,13 +803,6 @@ void rtl8192_halt_adapter(struct net_device *dev, bool reset)
        skb_queue_purge(&priv->skb_queue);
 }
 
-static const u16 rtl_rate[] = {10,20,55,110,60,90,120,180,240,360,480,540};
-inline u16 rtl8192_rate2rate(short rate)
-{
-       if (rate >11) return 0;
-       return rtl_rate[rate];
-}
-
 static void rtl8192_data_hard_stop(struct net_device *dev)
 {
 }
@@ -945,7 +834,7 @@ static void rtl8192_hard_data_xmit(struct sk_buff *skb, struct net_device *dev,
        memcpy(skb->cb, &dev, sizeof(dev));
 
        skb_push(skb, priv->ieee80211->tx_headroom);
-       ret = rtl8192_tx(dev, skb);
+       ret = rtl8192_tx(priv, skb);
        if (ret != 0) {
                kfree_skb(skb);
        }
@@ -979,7 +868,7 @@ static int rtl8192_hard_start_xmit(struct sk_buff *skb,struct net_device *dev)
 
         memcpy(skb->cb, &dev, sizeof(dev));
        if (queue_index == TXCMD_QUEUE) {
-               rtl819xE_tx_cmd(dev, skb);
+               rtl819xE_tx_cmd(priv, skb);
                ret = 0;
                return ret;
        } else {
@@ -988,7 +877,7 @@ static 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->ieee80211->tx_headroom);
-               ret = rtl8192_tx(dev, skb);
+               ret = rtl8192_tx(priv, skb);
                if (ret != 0) {
                        kfree_skb(skb);
                }
@@ -998,9 +887,8 @@ static int rtl8192_hard_start_xmit(struct sk_buff *skb,struct net_device *dev)
 }
 
 
-static void rtl8192_tx_isr(struct net_device *dev, int prio)
+static void rtl8192_tx_isr(struct r8192_priv *priv, int prio)
 {
-       struct r8192_priv *priv = (struct r8192_priv *)ieee80211_priv(dev);
        struct rtl8192_tx_ring *ring = &priv->tx_ring[prio];
 
        while (skb_queue_len(&ring->queue)) {
@@ -1023,14 +911,6 @@ static void rtl8192_tx_isr(struct net_device *dev, int prio)
 
                kfree_skb(skb);
        }
-       if (prio == MGNT_QUEUE) {
-               if (priv->ieee80211->ack_tx_to_ieee) {
-                       if (rtl8192_is_tx_queue_empty(dev)) {
-                               priv->ieee80211->ack_tx_to_ieee = 0;
-                               ieee80211_ps_tx_ack(priv->ieee80211, 1);
-                       }
-               }
-       }
 
        if (prio != BEACON_QUEUE) {
                /* try to deal with the pending packets  */
@@ -1042,9 +922,8 @@ static void rtl8192_stop_beacon(struct net_device *dev)
 {
 }
 
-static void rtl8192_config_rate(struct net_device* dev, u16* rate_config)
+static void rtl8192_config_rate(struct r8192_priv *priv, u16* rate_config)
 {
-        struct r8192_priv *priv = ieee80211_priv(dev);
         struct ieee80211_network *net;
         u8 i=0, basic_rate = 0;
         net = & priv->ieee80211->current_network;
@@ -1093,16 +972,16 @@ static void rtl8192_config_rate(struct net_device* dev, u16* rate_config)
 #define SHORT_SLOT_TIME 9
 #define NON_SHORT_SLOT_TIME 20
 
-static void rtl8192_update_cap(struct net_device* dev, u16 cap)
+static void rtl8192_update_cap(struct r8192_priv *priv, u16 cap)
 {
        u32 tmp = 0;
-       struct r8192_priv *priv = ieee80211_priv(dev);
        struct ieee80211_network *net = &priv->ieee80211->current_network;
+
        priv->short_preamble = cap & WLAN_CAPABILITY_SHORT_PREAMBLE;
        tmp = priv->basic_rate;
        if (priv->short_preamble)
                tmp |= BRSR_AckShortPmb;
-       write_nic_dword(dev, RRSR, tmp);
+       write_nic_dword(priv, RRSR, tmp);
 
        if (net->mode & (IEEE_G|IEEE_N_24G))
        {
@@ -1114,21 +993,20 @@ static void rtl8192_update_cap(struct net_device* dev, u16 cap)
                else //long slot time
                        slot_time = NON_SHORT_SLOT_TIME;
                priv->slot_time = slot_time;
-               write_nic_byte(dev, SLOT_TIME, slot_time);
+               write_nic_byte(priv, SLOT_TIME, slot_time);
        }
 
 }
 
-static void rtl8192_net_update(struct net_device *dev)
+static void rtl8192_net_update(struct r8192_priv *priv)
 {
-       struct r8192_priv *priv = ieee80211_priv(dev);
        struct ieee80211_network *net;
        u16 BcnTimeCfg = 0, BcnCW = 6, BcnIFS = 0xf;
        u16 rate_config = 0;
        net = &priv->ieee80211->current_network;
 
        /* update Basic rate: RR, BRSR */
-       rtl8192_config_rate(dev, &rate_config);
+       rtl8192_config_rate(priv, &rate_config);
 
        /*
         * Select RRSR (in Legacy-OFDM and CCK)
@@ -1139,31 +1017,30 @@ static void rtl8192_net_update(struct net_device *dev)
        priv->basic_rate = rate_config &= 0x15f;
 
        /* BSSID */
-       write_nic_dword(dev, BSSIDR, ((u32 *)net->bssid)[0]);
-       write_nic_word(dev, BSSIDR+4, ((u16 *)net->bssid)[2]);
+       write_nic_dword(priv, BSSIDR, ((u32 *)net->bssid)[0]);
+       write_nic_word(priv, BSSIDR+4, ((u16 *)net->bssid)[2]);
 
        if (priv->ieee80211->iw_mode == IW_MODE_ADHOC)
        {
-               write_nic_word(dev, ATIMWND, 2);
-               write_nic_word(dev, BCN_DMATIME, 256);
-               write_nic_word(dev, BCN_INTERVAL, net->beacon_interval);
+               write_nic_word(priv, ATIMWND, 2);
+               write_nic_word(priv, BCN_DMATIME, 256);
+               write_nic_word(priv, BCN_INTERVAL, net->beacon_interval);
                /*
                 * BIT15 of BCN_DRV_EARLY_INT will indicate
                 * whether software beacon or hw beacon is applied.
                 */
-               write_nic_word(dev, BCN_DRV_EARLY_INT, 10);
-               write_nic_byte(dev, BCN_ERR_THRESH, 100);
+               write_nic_word(priv, BCN_DRV_EARLY_INT, 10);
+               write_nic_byte(priv, BCN_ERR_THRESH, 100);
 
                BcnTimeCfg |= (BcnCW<<BCN_TCFG_CW_SHIFT);
                /* TODO: BcnIFS may required to be changed on ASIC */
                BcnTimeCfg |= BcnIFS<<BCN_TCFG_IFS;
-               write_nic_word(dev, BCN_TCFG, BcnTimeCfg);
+               write_nic_word(priv, BCN_TCFG, BcnTimeCfg);
        }
 }
 
-void rtl819xE_tx_cmd(struct net_device *dev, struct sk_buff *skb)
+static void rtl819xE_tx_cmd(struct r8192_priv *priv, struct sk_buff *skb)
 {
-    struct r8192_priv *priv = ieee80211_priv(dev);
     struct rtl8192_tx_ring *ring;
     tx_desc_819x_pci *entry;
     unsigned int idx;
@@ -1200,7 +1077,7 @@ void rtl819xE_tx_cmd(struct net_device *dev, struct sk_buff *skb)
     __skb_queue_tail(&ring->queue, skb);
     spin_unlock_irqrestore(&priv->irq_th_lock,flags);
 
-    write_nic_byte(dev, TPPoll, TPPoll_CQ);
+    write_nic_byte(priv, TPPoll, TPPoll_CQ);
 
     return;
 }
@@ -1310,9 +1187,8 @@ static u8 QueryIsShort(u8 TxHT, u8 TxRate, cb_desc *tcb_desc)
  * skb->cb will contain all the following information,
  * priority, morefrag, rate, &dev.
  */
-short rtl8192_tx(struct net_device *dev, struct sk_buff* skb)
+static short rtl8192_tx(struct r8192_priv *priv, struct sk_buff* skb)
 {
-       struct r8192_priv *priv = ieee80211_priv(dev);
        struct rtl8192_tx_ring *ring;
        unsigned long flags;
        cb_desc *tcb_desc = (cb_desc *)(skb->cb + MAX_DEV_ADDR_SIZE);
@@ -1380,12 +1256,8 @@ short rtl8192_tx(struct net_device *dev, struct sk_buff* skb)
        if (priv->CurrentChannelBW == HT_CHANNEL_WIDTH_20_40) {
                if (tcb_desc->bPacketBW) {
                        pTxFwInfo->TxBandwidth = 1;
-#ifdef RTL8190P
-                       pTxFwInfo->TxSubCarrier = 3;
-#else
                        /* use duplicated mode */
                        pTxFwInfo->TxSubCarrier = 0;
-#endif
                } else {
                        pTxFwInfo->TxBandwidth = 0;
                        pTxFwInfo->TxSubCarrier = priv->nCur40MhzPrimeSC;
@@ -1404,7 +1276,7 @@ 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,%x",
+               RT_TRACE(COMP_ERR, "No more TX desc@%d, ring->idx = %d,idx = %d,%x\n",
                         tcb_desc->queue_index, ring->idx, idx, skb->len);
                spin_unlock_irqrestore(&priv->irq_th_lock, flags);
                return skb->len;
@@ -1464,14 +1336,13 @@ short rtl8192_tx(struct net_device *dev, struct sk_buff* skb)
        __skb_queue_tail(&ring->queue, skb);
        pdesc->OWN = 1;
        spin_unlock_irqrestore(&priv->irq_th_lock, flags);
-       dev->trans_start = jiffies;
-       write_nic_word(dev, TPPoll, 0x01<<tcb_desc->queue_index);
+       priv->ieee80211->dev->trans_start = jiffies;
+       write_nic_word(priv, TPPoll, 0x01<<tcb_desc->queue_index);
        return 0;
 }
 
-static short rtl8192_alloc_rx_desc_ring(struct net_device *dev)
+static short rtl8192_alloc_rx_desc_ring(struct r8192_priv *priv)
 {
-    struct r8192_priv *priv = ieee80211_priv(dev);
     rx_desc_819x_pci *entry = NULL;
     int i;
 
@@ -1507,10 +1378,9 @@ static short rtl8192_alloc_rx_desc_ring(struct net_device *dev)
     return 0;
 }
 
-static int rtl8192_alloc_tx_desc_ring(struct net_device *dev,
+static int rtl8192_alloc_tx_desc_ring(struct r8192_priv *priv,
         unsigned int prio, unsigned int entries)
 {
-    struct r8192_priv *priv = (struct r8192_priv *)ieee80211_priv(dev);
     tx_desc_819x_pci *ring;
     dma_addr_t dma;
     int i;
@@ -1535,19 +1405,18 @@ static int rtl8192_alloc_tx_desc_ring(struct net_device *dev,
     return 0;
 }
 
-static short rtl8192_pci_initdescring(struct net_device *dev)
+static short rtl8192_pci_initdescring(struct r8192_priv *priv)
 {
        u32 ret;
        int i;
-       struct r8192_priv *priv = ieee80211_priv(dev);
 
-       ret = rtl8192_alloc_rx_desc_ring(dev);
+       ret = rtl8192_alloc_rx_desc_ring(priv);
        if (ret)
                return ret;
 
        /* general process for other queue */
        for (i = 0; i < MAX_TX_QUEUE_COUNT; i++) {
-               ret = rtl8192_alloc_tx_desc_ring(dev, i, priv->txringcount);
+               ret = rtl8192_alloc_tx_desc_ring(priv, i, priv->txringcount);
                if (ret)
                        goto err_free_rings;
        }
@@ -1555,16 +1424,15 @@ static short rtl8192_pci_initdescring(struct net_device *dev)
        return 0;
 
 err_free_rings:
-       rtl8192_free_rx_ring(dev);
+       rtl8192_free_rx_ring(priv);
        for (i = 0; i < MAX_TX_QUEUE_COUNT; i++)
                if (priv->tx_ring[i].desc)
-                       rtl8192_free_tx_ring(dev, i);
+                       rtl8192_free_tx_ring(priv, i);
        return 1;
 }
 
-static void rtl8192_pci_resetdescring(struct net_device *dev)
+static void rtl8192_pci_resetdescring(struct r8192_priv *priv)
 {
-    struct r8192_priv *priv = ieee80211_priv(dev);
     int i;
 
     /* force the rx_idx to the first one */
@@ -1601,37 +1469,34 @@ static void rtl8192_link_change(struct net_device *dev)
 {
        struct r8192_priv *priv = ieee80211_priv(dev);
        struct ieee80211_device* ieee = priv->ieee80211;
-       //write_nic_word(dev, BCN_INTR_ITV, net->beacon_interval);
+
        if (ieee->state == IEEE80211_LINKED)
        {
-               rtl8192_net_update(dev);
-               rtl8192_update_ratr_table(dev);
-#if 1
+               rtl8192_net_update(priv);
+               rtl8192_update_ratr_table(priv);
+
                //add this as in pure N mode, wep encryption will use software way, but there is no chance to set this as wep will not set group key in wext. WB.2008.07.08
                if ((KEY_TYPE_WEP40 == ieee->pairwise_key_type) || (KEY_TYPE_WEP104 == ieee->pairwise_key_type))
-               EnableHWSecurityConfig8192(dev);
-#endif
+               EnableHWSecurityConfig8192(priv);
        }
        else
        {
-               write_nic_byte(dev, 0x173, 0);
+               write_nic_byte(priv, 0x173, 0);
        }
-       /*update timing params*/
-       //rtl8192_set_chan(dev, priv->chan);
-       //MSR
-       rtl8192_update_msr(dev);
+
+       rtl8192_update_msr(priv);
 
        // 2007/10/16 MH MAC Will update TSF according to all received beacon, so we have
        //      // To set CBSSID bit when link with any AP or STA.
        if (ieee->iw_mode == IW_MODE_INFRA || ieee->iw_mode == IW_MODE_ADHOC)
        {
                u32 reg = 0;
-               reg = read_nic_dword(dev, RCR);
+               reg = read_nic_dword(priv, RCR);
                if (priv->ieee80211->state == IEEE80211_LINKED)
                        priv->ReceiveConfig = reg |= RCR_CBSSID;
                else
                        priv->ReceiveConfig = reg &= ~RCR_CBSSID;
-               write_nic_dword(dev, RCR, reg);
+               write_nic_dword(priv, RCR, reg);
        }
 }
 
@@ -1647,14 +1512,13 @@ static const struct ieee80211_qos_parameters def_qos_parameters = {
 static void rtl8192_update_beacon(struct work_struct * work)
 {
         struct r8192_priv *priv = container_of(work, struct r8192_priv, update_beacon_wq.work);
-        struct net_device *dev = priv->ieee80211->dev;
        struct ieee80211_device* ieee = priv->ieee80211;
        struct ieee80211_network* net = &ieee->current_network;
 
        if (ieee->pHTInfo->bCurrentHTSupport)
                HTUpdateSelfAndPeerSetting(ieee, net);
        ieee->pHTInfo->bCurrentRT2RTLongSlotTime = net->bssht.bdRT2RTLongSlotTime;
-       rtl8192_update_cap(dev, net->capability);
+       rtl8192_update_cap(priv, net->capability);
 }
 
 /*
@@ -1664,7 +1528,6 @@ static const int WDCAPARA_ADD[] = {EDCAPARA_BE,EDCAPARA_BK,EDCAPARA_VI,EDCAPARA_
 static void rtl8192_qos_activate(struct work_struct * work)
 {
         struct r8192_priv *priv = container_of(work, struct r8192_priv, qos_activate);
-        struct net_device *dev = priv->ieee80211->dev;
         struct ieee80211_qos_parameters *qos_parameters = &priv->ieee80211->current_network.qos_data.parameters;
         u8 mode = priv->ieee80211->current_network.mode;
        u8  u1bAIFS;
@@ -1685,8 +1548,7 @@ static void rtl8192_qos_activate(struct work_struct * work)
                                (((u32)(qos_parameters->cw_max[i]))<< AC_PARAM_ECW_MAX_OFFSET)|
                                (((u32)(qos_parameters->cw_min[i]))<< AC_PARAM_ECW_MIN_OFFSET)|
                                ((u32)u1bAIFS << AC_PARAM_AIFS_OFFSET));
-               write_nic_dword(dev, WDCAPARA_ADD[i], u4bAcParam);
-               //write_nic_dword(dev, WDCAPARA_ADD[i], 0x005e4332);
+               write_nic_dword(priv, WDCAPARA_ADD[i], u4bAcParam);
        }
 
 success:
@@ -1727,7 +1589,7 @@ static int rtl8192_qos_handle_probe_response(struct r8192_priv *priv,
 
                if ((network->qos_data.active == 1) && (active_network == 1)) {
                        queue_work(priv->priv_wq, &priv->qos_activate);
-                       RT_TRACE(COMP_QOS, "QoS was disabled call qos_activate \n");
+                       RT_TRACE(COMP_QOS, "QoS was disabled call qos_activate\n");
                }
                network->qos_data.active = 0;
                network->qos_data.supported = 0;
@@ -1814,15 +1676,14 @@ static int rtl8192_handle_assoc_response(struct net_device *dev,
 
 
 /* updateRATRTabel for MCS only. Basic rate is not implemented. */
-static void rtl8192_update_ratr_table(struct net_device* dev)
+static void rtl8192_update_ratr_table(struct r8192_priv* priv)
 {
-       struct r8192_priv* priv = ieee80211_priv(dev);
        struct ieee80211_device* ieee = priv->ieee80211;
        u8* pMcsRate = ieee->dot11HTOperationalRateSet;
        u32 ratr_value = 0;
        u8 rate_index = 0;
 
-       rtl8192_config_rate(dev, (u16*)(&ratr_value));
+       rtl8192_config_rate(priv, (u16*)(&ratr_value));
        ratr_value |= (*(u16*)(pMcsRate)) << 12;
 
        switch (ieee->mode)
@@ -1856,8 +1717,8 @@ static void rtl8192_update_ratr_table(struct net_device* dev)
        }else if(!ieee->pHTInfo->bCurTxBW40MHz && ieee->pHTInfo->bCurShortGI20MHz){
                ratr_value |= 0x80000000;
        }
-       write_nic_dword(dev, RATR0+rate_index*4, ratr_value);
-       write_nic_byte(dev, UFWP, 1);
+       write_nic_dword(priv, RATR0+rate_index*4, ratr_value);
+       write_nic_byte(priv, UFWP, 1);
 }
 
 static bool GetNmodeSupportBySecCfg8190Pci(struct net_device*dev)
@@ -1881,31 +1742,15 @@ static void rtl8192_refresh_supportrate(struct r8192_priv* priv)
                memset(ieee->Regdot11HTOperationalRateSet, 0, 16);
 }
 
-static u8 rtl8192_getSupportedWireleeMode(struct net_device*dev)
+static u8 rtl8192_getSupportedWireleeMode(void)
 {
-       struct r8192_priv *priv = ieee80211_priv(dev);
-       u8 ret = 0;
-       switch(priv->rf_chip)
-       {
-               case RF_8225:
-               case RF_8256:
-               case RF_PSEUDO_11N:
-                       ret = (WIRELESS_MODE_N_24G|WIRELESS_MODE_G|WIRELESS_MODE_B);
-                       break;
-               case RF_8258:
-                       ret = (WIRELESS_MODE_A|WIRELESS_MODE_N_5G);
-                       break;
-               default:
-                       ret = WIRELESS_MODE_B;
-                       break;
-       }
-       return ret;
+       return (WIRELESS_MODE_N_24G|WIRELESS_MODE_G|WIRELESS_MODE_B);
 }
 
 static void rtl8192_SetWirelessMode(struct net_device* dev, u8 wireless_mode)
 {
        struct r8192_priv *priv = ieee80211_priv(dev);
-       u8 bSupportMode = rtl8192_getSupportedWireleeMode(dev);
+       u8 bSupportMode = rtl8192_getSupportedWireleeMode();
 
        if ((wireless_mode == WIRELESS_MODE_AUTO) || ((wireless_mode&bSupportMode)==0))
        {
@@ -1952,7 +1797,7 @@ static bool GetHalfNmodeSupportByAPs819xPci(struct net_device* dev)
        return ieee->bHalfWirelessN24GMode;
 }
 
-short rtl8192_is_tx_queue_empty(struct net_device *dev)
+static short rtl8192_is_tx_queue_empty(struct net_device *dev)
 {
        int i=0;
        struct r8192_priv *priv = ieee80211_priv(dev);
@@ -1968,51 +1813,18 @@ short rtl8192_is_tx_queue_empty(struct net_device *dev)
        return 1;
 }
 
-static void rtl8192_hw_sleep_down(struct net_device *dev)
-{
-       struct r8192_priv *priv = ieee80211_priv(dev);
-       unsigned long flags = 0;
-
-       spin_lock_irqsave(&priv->rf_ps_lock,flags);
-       if (priv->RFChangeInProgress) {
-               spin_unlock_irqrestore(&priv->rf_ps_lock,flags);
-               RT_TRACE(COMP_RF, "rtl8192_hw_sleep_down(): RF Change in progress! \n");
-               printk("rtl8192_hw_sleep_down(): RF Change in progress!\n");
-               return;
-       }
-       spin_unlock_irqrestore(&priv->rf_ps_lock,flags);
-
-       MgntActSet_RF_State(dev, eRfSleep, RF_CHANGE_BY_PS);
-}
-
-static void rtl8192_hw_sleep_wq (struct work_struct *work)
+static void rtl8192_hw_sleep_down(struct r8192_priv *priv)
 {
-        struct delayed_work *dwork = container_of(work,struct delayed_work,work);
-        struct ieee80211_device *ieee = container_of(dwork,struct ieee80211_device,hw_sleep_wq);
-        struct net_device *dev = ieee->dev;
-
-        rtl8192_hw_sleep_down(dev);
+       MgntActSet_RF_State(priv, eRfSleep, RF_CHANGE_BY_PS);
 }
 
 static void rtl8192_hw_wakeup(struct net_device* dev)
 {
        struct r8192_priv *priv = ieee80211_priv(dev);
-       unsigned long flags = 0;
-
-       spin_lock_irqsave(&priv->rf_ps_lock,flags);
-       if (priv->RFChangeInProgress) {
-               spin_unlock_irqrestore(&priv->rf_ps_lock,flags);
-               RT_TRACE(COMP_RF, "rtl8192_hw_wakeup(): RF Change in progress! \n");
-               printk("rtl8192_hw_wakeup(): RF Change in progress! schedule wake up task again\n");
-               queue_delayed_work(priv->ieee80211->wq,&priv->ieee80211->hw_wakeup_wq,MSECS(10));//PowerSave is not supported if kernel version is below 2.6.20
-               return;
-       }
-       spin_unlock_irqrestore(&priv->rf_ps_lock,flags);
-
-       MgntActSet_RF_State(dev, eRfOn, RF_CHANGE_BY_PS);
+       MgntActSet_RF_State(priv, eRfOn, RF_CHANGE_BY_PS);
 }
 
-void rtl8192_hw_wakeup_wq (struct work_struct *work)
+static void rtl8192_hw_wakeup_wq (struct work_struct *work)
 {
        struct delayed_work *dwork = container_of(work,struct delayed_work,work);
        struct ieee80211_device *ieee = container_of(dwork,struct ieee80211_device,hw_wakeup_wq);
@@ -2026,11 +1838,8 @@ void rtl8192_hw_wakeup_wq (struct work_struct *work)
 static void rtl8192_hw_to_sleep(struct net_device *dev, u32 th, u32 tl)
 {
        struct r8192_priv *priv = ieee80211_priv(dev);
-
+       u32 tmp;
        u32 rb = jiffies;
-       unsigned long flags;
-
-       spin_lock_irqsave(&priv->ps_lock,flags);
 
        // Writing HW register with 0 equals to disable
        // the timer, that is not really what we want
@@ -2043,7 +1852,6 @@ static void rtl8192_hw_to_sleep(struct net_device *dev, u32 th, u32 tl)
        //
        if(((tl>=rb)&& (tl-rb) <= MSECS(MIN_SLEEP_TIME))
                        ||((rb>tl)&& (rb-tl) < MSECS(MIN_SLEEP_TIME))) {
-               spin_unlock_irqrestore(&priv->ps_lock,flags);
                printk("too short to sleep::%x, %x, %lx\n",tl, rb,  MSECS(MIN_SLEEP_TIME));
                return;
        }
@@ -2052,26 +1860,20 @@ static void rtl8192_hw_to_sleep(struct net_device *dev, u32 th, u32 tl)
                        ((tl < rb) && (tl>MSECS(69)) && ((rb-tl) > MSECS(MAX_SLEEP_TIME)))||
                        ((tl<rb)&&(tl<MSECS(69))&&((tl+0xffffffff-rb)>MSECS(MAX_SLEEP_TIME)))) {
                printk("========>too long to sleep:%x, %x, %lx\n", tl, rb,  MSECS(MAX_SLEEP_TIME));
-               spin_unlock_irqrestore(&priv->ps_lock,flags);
                return;
        }
-       {
-               u32 tmp = (tl>rb)?(tl-rb):(rb-tl);
-               queue_delayed_work(priv->ieee80211->wq,
-                               &priv->ieee80211->hw_wakeup_wq,tmp);
-               //PowerSave not supported when kernel version less 2.6.20
-       }
+
+       tmp = (tl>rb)?(tl-rb):(rb-tl);
        queue_delayed_work(priv->ieee80211->wq,
-                       (void *)&priv->ieee80211->hw_sleep_wq,0);
-       spin_unlock_irqrestore(&priv->ps_lock,flags);
+                          &priv->ieee80211->hw_wakeup_wq,tmp);
 
+        rtl8192_hw_sleep_down(priv);
 }
 
-static void rtl8192_init_priv_variable(struct net_device* dev)
+static void rtl8192_init_priv_variable(struct r8192_priv *priv)
 {
-       struct r8192_priv *priv = ieee80211_priv(dev);
        u8 i;
-       PRT_POWER_SAVE_CONTROL  pPSC = (PRT_POWER_SAVE_CONTROL)(&(priv->ieee80211->PowerSaveControl));
+       PRT_POWER_SAVE_CONTROL pPSC = &priv->PowerSaveControl;
 
        // Default Halt the NIC if RF is OFF.
        pPSC->RegRfPsLevel |= RT_RF_OFF_LEVL_HALT_NIC;
@@ -2079,16 +1881,13 @@ static void rtl8192_init_priv_variable(struct net_device* dev)
        pPSC->RegRfPsLevel |= RT_RF_OFF_LEVL_ASPM;
        pPSC->RegRfPsLevel |= RT_RF_LPS_LEVEL_ASPM;
        pPSC->bLeisurePs = true;
-       pPSC->RegMaxLPSAwakeIntvl = 5;
+       priv->ieee80211->RegMaxLPSAwakeIntvl = 5;
        priv->bHwRadioOff = false;
 
        priv->being_init_adapter = false;
        priv->txringcount = 64;//32;
        priv->rxbuffersize = 9100;//2048;//1024;
        priv->rxringcount = MAX_RX_COUNT;//64;
-       priv->irq_enabled=0;
-       priv->card_8192 = NIC_8192E;
-       priv->rx_skb_complete = 1;
        priv->chan = 1; //set to channel 1
        priv->RegWirelessMode = WIRELESS_MODE_AUTO;
        priv->RegChannelPlan = 0xf;
@@ -2100,7 +1899,7 @@ static void rtl8192_init_priv_variable(struct net_device* dev)
        priv->ieee80211->rts = DEFAULT_RTS_THRESHOLD;
        priv->ieee80211->rate = 110; //11 mbps
        priv->ieee80211->short_slot = 1;
-       priv->promisc = (dev->flags & IFF_PROMISC) ? 1:0;
+       priv->promisc = (priv->ieee80211->dev->flags & IFF_PROMISC) ? 1:0;
        priv->bcck_in_ch14 = false;
        priv->CCKPresentAttentuation = 0;
        priv->rfa_txpowertrackingindex = 0;
@@ -2112,12 +1911,10 @@ static void rtl8192_init_priv_variable(struct net_device* dev)
        priv->bDisableNormalResetCheck = false;
        priv->force_reset = false;
        //added by amy for power save
-       priv->ieee80211->RfOffReason = 0;
-       priv->RFChangeInProgress = false;
+       priv->RfOffReason = 0;
        priv->bHwRfOffAction = 0;
-       priv->SetRFPowerStateInProgress = false;
-       priv->ieee80211->PowerSaveControl.bInactivePs = true;
-       priv->ieee80211->PowerSaveControl.bIPSModeBackup = false;
+       priv->PowerSaveControl.bInactivePs = true;
+       priv->PowerSaveControl.bIPSModeBackup = false;
 
        priv->ieee80211->current_network.beacon_interval = DEFAULT_BEACONINTERVAL;
        priv->ieee80211->iw_mode = IW_MODE_INFRA;
@@ -2130,8 +1927,6 @@ static void rtl8192_init_priv_variable(struct net_device* dev)
        priv->ieee80211->modulation = IEEE80211_CCK_MODULATION | IEEE80211_OFDM_MODULATION;
        priv->ieee80211->host_encrypt = 1;
        priv->ieee80211->host_decrypt = 1;
-       //priv->ieee80211->start_send_beacons = NULL;//rtl819xusb_beacon_tx;//-by amy 080604
-       //priv->ieee80211->stop_send_beacons = NULL;//rtl8192_beacon_stop;//-by amy 080604
        priv->ieee80211->start_send_beacons = rtl8192_start_beacon;//+by david 081107
        priv->ieee80211->stop_send_beacons = rtl8192_stop_beacon;//+by david 081107
        priv->ieee80211->softmac_hard_start_xmit = rtl8192_hard_start_xmit;
@@ -2145,23 +1940,17 @@ static void rtl8192_init_priv_variable(struct net_device* dev)
        priv->ieee80211->check_nic_enough_desc = check_nic_enough_desc;
        priv->ieee80211->tx_headroom = sizeof(TX_FWINFO_8190PCI);
        priv->ieee80211->qos_support = 1;
-       priv->ieee80211->dot11PowerSaveMode = 0;
-       //added by WB
-//     priv->ieee80211->SwChnlByTimerHandler = rtl8192_phy_SwChnl;
        priv->ieee80211->SetBWModeHandler = rtl8192_SetBWMode;
        priv->ieee80211->handle_assoc_response = rtl8192_handle_assoc_response;
        priv->ieee80211->handle_beacon = rtl8192_handle_beacon;
 
        priv->ieee80211->sta_wake_up = rtl8192_hw_wakeup;
-//     priv->ieee80211->ps_request_tx_ack = rtl8192_rq_tx_ack;
        priv->ieee80211->enter_sleep_state = rtl8192_hw_to_sleep;
        priv->ieee80211->ps_is_queue_empty = rtl8192_is_tx_queue_empty;
-       //added by david
        priv->ieee80211->GetNmodeSupportBySecCfg = GetNmodeSupportBySecCfg8190Pci;
        priv->ieee80211->SetWirelessMode = rtl8192_SetWirelessMode;
        priv->ieee80211->GetHalfNmodeSupportByAPsHandler = GetHalfNmodeSupportByAPs819xPci;
 
-       //added by amy
        priv->ieee80211->InitialGainHandler = InitialGain819xPci;
 
 #ifdef ENABLE_IPS
@@ -2185,11 +1974,6 @@ static void rtl8192_init_priv_variable(struct net_device* dev)
                RCR_AAP | ((u32)7<<RCR_MXDMA_OFFSET) |
                ((u32)7 << RCR_FIFO_OFFSET) | RCR_ONLYERLPKT;
 
-       priv->irq_mask =        (u32)(IMR_ROK | IMR_VODOK | IMR_VIDOK | IMR_BEDOK | IMR_BKDOK |
-                               IMR_HCCADOK | IMR_MGNTDOK | IMR_COMDOK | IMR_HIGHDOK |
-                               IMR_BDOK | IMR_RXCMDOK | IMR_TIMEOUT0 | IMR_RDU | IMR_RXFOVW |
-                               IMR_TXFOVW | IMR_BcnInt | IMR_TBDOK | IMR_TBDER);
-
        priv->pFirmware = vzalloc(sizeof(rt_firmware));
 
        /* rx related queue */
@@ -2207,10 +1991,8 @@ static void rtl8192_init_priv_variable(struct net_device* dev)
 
 static void rtl8192_init_priv_lock(struct r8192_priv* priv)
 {
-       spin_lock_init(&priv->tx_lock);
        spin_lock_init(&priv->irq_th_lock);
        spin_lock_init(&priv->rf_ps_lock);
-       spin_lock_init(&priv->ps_lock);
        sema_init(&priv->wx_sem,1);
        sema_init(&priv->rf_sem,1);
        mutex_init(&priv->mutex);
@@ -2218,85 +2000,52 @@ static void rtl8192_init_priv_lock(struct r8192_priv* priv)
 
 /* init tasklet and wait_queue here */
 #define DRV_NAME "wlan0"
-static void rtl8192_init_priv_task(struct net_device* dev)
+static void rtl8192_init_priv_task(struct r8192_priv *priv)
 {
-       struct r8192_priv *priv = ieee80211_priv(dev);
-
-#ifdef PF_SYNCTHREAD
-       priv->priv_wq = create_workqueue(DRV_NAME,0);
-#else
        priv->priv_wq = create_workqueue(DRV_NAME);
-#endif
 
 #ifdef ENABLE_IPS
-       INIT_WORK(&priv->ieee80211->ips_leave_wq, (void*)IPSLeave_wq);
+       INIT_WORK(&priv->ieee80211->ips_leave_wq, IPSLeave_wq);
 #endif
 
-//     INIT_WORK(&priv->reset_wq, (void(*)(void*)) rtl8192_restart);
        INIT_WORK(&priv->reset_wq,  rtl8192_restart);
-//     INIT_DELAYED_WORK(&priv->watch_dog_wq, hal_dm_watchdog);
        INIT_DELAYED_WORK(&priv->watch_dog_wq, rtl819x_watchdog_wqcallback);
        INIT_DELAYED_WORK(&priv->txpower_tracking_wq,  dm_txpower_trackingcallback);
        INIT_DELAYED_WORK(&priv->rfpath_check_wq,  dm_rf_pathcheck_workitemcallback);
        INIT_DELAYED_WORK(&priv->update_beacon_wq, rtl8192_update_beacon);
-       //INIT_WORK(&priv->SwChnlWorkItem,  rtl8192_SwChnl_WorkItem);
-       //INIT_WORK(&priv->SetBWModeWorkItem,  rtl8192_SetBWModeWorkItem);
        INIT_WORK(&priv->qos_activate, rtl8192_qos_activate);
-       INIT_DELAYED_WORK(&priv->ieee80211->hw_wakeup_wq,(void*) rtl8192_hw_wakeup_wq);
-       INIT_DELAYED_WORK(&priv->ieee80211->hw_sleep_wq,(void*) rtl8192_hw_sleep_wq);
+       INIT_DELAYED_WORK(&priv->ieee80211->hw_wakeup_wq, rtl8192_hw_wakeup_wq);
 
-       tasklet_init(&priv->irq_rx_tasklet,
-            (void(*)(unsigned long))rtl8192_irq_rx_tasklet,
-            (unsigned long)priv);
-       tasklet_init(&priv->irq_tx_tasklet,
-            (void(*)(unsigned long))rtl8192_irq_tx_tasklet,
-            (unsigned long)priv);
-        tasklet_init(&priv->irq_prepare_beacon_tasklet,
-                (void(*)(unsigned long))rtl8192_prepare_beacon,
-                (unsigned long)priv);
+       tasklet_init(&priv->irq_rx_tasklet, rtl8192_irq_rx_tasklet,
+                    (unsigned long) priv);
+       tasklet_init(&priv->irq_tx_tasklet, rtl8192_irq_tx_tasklet,
+                    (unsigned long) priv);
+        tasklet_init(&priv->irq_prepare_beacon_tasklet, rtl8192_prepare_beacon,
+                    (unsigned long) priv);
 }
 
-static void rtl8192_get_eeprom_size(struct net_device* dev)
+static void rtl8192_get_eeprom_size(struct r8192_priv *priv)
 {
        u16 curCR = 0;
-       struct r8192_priv *priv = ieee80211_priv(dev);
        RT_TRACE(COMP_INIT, "===========>%s()\n", __FUNCTION__);
-       curCR = read_nic_dword(dev, EPROM_CMD);
+       curCR = read_nic_dword(priv, EPROM_CMD);
        RT_TRACE(COMP_INIT, "read from Reg Cmd9346CR(%x):%x\n", EPROM_CMD, curCR);
        //whether need I consider BIT5?
        priv->epromtype = (curCR & EPROM_CMD_9356SEL) ? EPROM_93c56 : EPROM_93c46;
        RT_TRACE(COMP_INIT, "<===========%s(), epromtype:%d\n", __FUNCTION__, priv->epromtype);
 }
 
-/*
- * used to swap endian. as ntohl & htonl are not
- * neccessary to swap endian, so use this instead.
- */
-static inline u16 endian_swap(u16* data)
-{
-       u16 tmp = *data;
-       *data = (tmp >> 8) | (tmp << 8);
-       return *data;
-}
-
 /*
  * Adapter->EEPROMAddressSize should be set before this function call.
  *  EEPROM address size can be got through GetEEPROMSize8185()
  */
-static void rtl8192_read_eeprom_info(struct net_device* dev)
+static void rtl8192_read_eeprom_info(struct r8192_priv *priv)
 {
-       struct r8192_priv *priv = ieee80211_priv(dev);
-
+       struct net_device *dev = priv->ieee80211->dev;
        u8                      tempval;
-#ifdef RTL8192E
        u8                      ICVer8192, ICVer8256;
-#endif
        u16                     i,usValue, IC_Version;
        u16                     EEPROMId;
-#ifdef RTL8190P
-       u8                      offset;
-       u8                      EepromTxPower[100];
-#endif
        u8 bMac_Tmp_Addr[6] = {0x00, 0xe0, 0x4c, 0x00, 0x00, 0x01};
        RT_TRACE(COMP_INIT, "====> rtl8192_read_eeprom_info\n");
 
@@ -2304,7 +2053,7 @@ static void rtl8192_read_eeprom_info(struct net_device* dev)
        // TODO: I don't know if we need to apply EF function to EEPROM read function
 
        //2 Read EEPROM ID to make sure autoload is success
-       EEPROMId = eprom_read(dev, 0);
+       EEPROMId = eprom_read(priv, 0);
        if( EEPROMId != RTL8190_EEPROM_ID )
        {
                RT_TRACE(COMP_ERR, "EEPROM ID is invalid:%x, %x\n", EEPROMId, RTL8190_EEPROM_ID);
@@ -2322,30 +2071,25 @@ static void rtl8192_read_eeprom_info(struct net_device* dev)
        if(!priv->AutoloadFailFlag)
        {
                // VID, PID
-               priv->eeprom_vid = eprom_read(dev, (EEPROM_VID >> 1));
-               priv->eeprom_did = eprom_read(dev, (EEPROM_DID >> 1));
+               priv->eeprom_vid = eprom_read(priv, (EEPROM_VID >> 1));
+               priv->eeprom_did = eprom_read(priv, (EEPROM_DID >> 1));
 
-               usValue = eprom_read(dev, (u16)(EEPROM_Customer_ID>>1)) >> 8 ;
+               usValue = eprom_read(priv, (u16)(EEPROM_Customer_ID>>1)) >> 8 ;
                priv->eeprom_CustomerID = (u8)( usValue & 0xff);
-               usValue = eprom_read(dev, (EEPROM_ICVersion_ChannelPlan>>1));
+               usValue = eprom_read(priv, (EEPROM_ICVersion_ChannelPlan>>1));
                priv->eeprom_ChannelPlan = usValue&0xff;
                IC_Version = ((usValue&0xff00)>>8);
 
-#ifdef RTL8190P
-               priv->card_8192_version = (VERSION_8190)(IC_Version);
-#else
-       #ifdef RTL8192E
                ICVer8192 = (IC_Version&0xf);           //bit0~3; 1:A cut, 2:B cut, 3:C cut...
                ICVer8256 = ((IC_Version&0xf0)>>4);//bit4~6, bit7 reserved for other RF chip; 1:A cut, 2:B cut, 3:C cut...
-               RT_TRACE(COMP_INIT, "\nICVer8192 = 0x%x\n", ICVer8192);
-               RT_TRACE(COMP_INIT, "\nICVer8256 = 0x%x\n", ICVer8256);
+               RT_TRACE(COMP_INIT, "ICVer8192 = 0x%x\n", ICVer8192);
+               RT_TRACE(COMP_INIT, "ICVer8256 = 0x%x\n", ICVer8256);
                if(ICVer8192 == 0x2)    //B-cut
                {
                        if(ICVer8256 == 0x5) //E-cut
                                priv->card_8192_version= VERSION_8190_BE;
                }
-       #endif
-#endif
+
                switch(priv->card_8192_version)
                {
                        case VERSION_8190_BD:
@@ -2364,7 +2108,7 @@ static void rtl8192_read_eeprom_info(struct net_device* dev)
                priv->eeprom_did = 0;
                priv->eeprom_CustomerID = 0;
                priv->eeprom_ChannelPlan = 0;
-               RT_TRACE(COMP_INIT, "\nIC Version = 0x%x\n", 0xff);
+               RT_TRACE(COMP_INIT, "IC Version = 0x%x\n", 0xff);
        }
 
        RT_TRACE(COMP_INIT, "EEPROM VID = 0x%4x\n", priv->eeprom_vid);
@@ -2376,7 +2120,7 @@ static void rtl8192_read_eeprom_info(struct net_device* dev)
        {
                for(i = 0; i < 6; i += 2)
                {
-                       usValue = eprom_read(dev, (u16) ((EEPROM_NODE_ADDRESS_BYTE_0+i)>>1));
+                       usValue = eprom_read(priv, (u16) ((EEPROM_NODE_ADDRESS_BYTE_0+i)>>1));
                        *(u16*)(&dev->dev_addr[i]) = usValue;
                }
        } else {
@@ -2402,7 +2146,7 @@ static void rtl8192_read_eeprom_info(struct net_device* dev)
                // Read RF-indication and Tx Power gain index diff of legacy to HT OFDM rate.
                if(!priv->AutoloadFailFlag)
                {
-                       tempval = (eprom_read(dev, (EEPROM_RFInd_PowerDiff>>1))) & 0xff;
+                       tempval = (eprom_read(priv, (EEPROM_RFInd_PowerDiff>>1))) & 0xff;
                        priv->EEPROMLegacyHTTxPowerDiff = tempval & 0xf;        // bit[3:0]
 
                        if (tempval&0x80)       //RF-indication, bit[7]
@@ -2420,7 +2164,7 @@ static void rtl8192_read_eeprom_info(struct net_device* dev)
                // Read ThermalMeter from EEPROM
                if(!priv->AutoloadFailFlag)
                {
-                       priv->EEPROMThermalMeter = (u8)(((eprom_read(dev, (EEPROM_ThermalMeter>>1))) & 0xff00)>>8);
+                       priv->EEPROMThermalMeter = (u8)(((eprom_read(priv, (EEPROM_ThermalMeter>>1))) & 0xff00)>>8);
                }
                else
                {
@@ -2435,7 +2179,7 @@ static void rtl8192_read_eeprom_info(struct net_device* dev)
                // Read antenna tx power offset of B/C/D to A and CrystalCap from EEPROM
                if(!priv->AutoloadFailFlag)
                {
-                               usValue = eprom_read(dev, (EEPROM_TxPwDiff_CrystalCap>>1));
+                               usValue = eprom_read(priv, (EEPROM_TxPwDiff_CrystalCap>>1));
                                priv->EEPROMAntPwDiff = (usValue&0x0fff);
                                priv->EEPROMCrystalCap = (u8)((usValue&0xf000)>>12);
                }
@@ -2454,7 +2198,7 @@ static void rtl8192_read_eeprom_info(struct net_device* dev)
                {
                        if(!priv->AutoloadFailFlag)
                        {
-                               usValue = eprom_read(dev, (u16) ((EEPROM_TxPwIndex_CCK+i)>>1) );
+                               usValue = eprom_read(priv, (u16) ((EEPROM_TxPwIndex_CCK+i)>>1) );
                        }
                        else
                        {
@@ -2468,7 +2212,7 @@ static void rtl8192_read_eeprom_info(struct net_device* dev)
                {
                        if(!priv->AutoloadFailFlag)
                        {
-                               usValue = eprom_read(dev, (u16) ((EEPROM_TxPwIndex_OFDM_24G+i)>>1) );
+                               usValue = eprom_read(priv, (u16) ((EEPROM_TxPwIndex_OFDM_24G+i)>>1) );
                        }
                        else
                        {
@@ -2479,82 +2223,7 @@ static void rtl8192_read_eeprom_info(struct net_device* dev)
                        RT_TRACE(COMP_INIT, "OFDM 2.4G Tx Power Level, Index %d = 0x%02x\n", i+1, priv->EEPROMTxPowerLevelOFDM24G[i+1]);
                }
                }
-               else if(priv->epromtype== EPROM_93c56)
-               {
-               #ifdef RTL8190P
-                       // Read CrystalCap from EEPROM
-                       if(!priv->AutoloadFailFlag)
-                       {
-                               priv->EEPROMAntPwDiff = EEPROM_Default_AntTxPowerDiff;
-                               priv->EEPROMCrystalCap = (u8)(((eprom_read(dev, (EEPROM_C56_CrystalCap>>1))) & 0xf000)>>12);
-                       }
-                       else
-                       {
-                               priv->EEPROMAntPwDiff = EEPROM_Default_AntTxPowerDiff;
-                               priv->EEPROMCrystalCap = EEPROM_Default_TxPwDiff_CrystalCap;
-                       }
-                       RT_TRACE(COMP_INIT,"EEPROMAntPwDiff = %d\n", priv->EEPROMAntPwDiff);
-                       RT_TRACE(COMP_INIT, "EEPROMCrystalCap = %d\n", priv->EEPROMCrystalCap);
-
-                       // Get Tx Power Level by Channel
-                       if(!priv->AutoloadFailFlag)
-                       {
-                                   // Read Tx power of Channel 1 ~ 14 from EEPROM.
-                              for(i = 0; i < 12; i+=2)
-                               {
-                                       if (i <6)
-                                               offset = EEPROM_C56_RfA_CCK_Chnl1_TxPwIndex + i;
-                                       else
-                                               offset = EEPROM_C56_RfC_CCK_Chnl1_TxPwIndex + i - 6;
-                                       usValue = eprom_read(dev, (offset>>1));
-                                      *((u16*)(&EepromTxPower[i])) = usValue;
-                               }
-
-                              for(i = 0; i < 12; i++)
-                               {
-                                       if (i <= 2)
-                                               priv->EEPROMRfACCKChnl1TxPwLevel[i] = EepromTxPower[i];
-                                       else if ((i >=3 )&&(i <= 5))
-                                               priv->EEPROMRfAOfdmChnlTxPwLevel[i-3] = EepromTxPower[i];
-                                       else if ((i >=6 )&&(i <= 8))
-                                               priv->EEPROMRfCCCKChnl1TxPwLevel[i-6] = EepromTxPower[i];
-                                       else
-                                               priv->EEPROMRfCOfdmChnlTxPwLevel[i-9] = EepromTxPower[i];
-                               }
-                       }
-                       else
-                       {
-                               priv->EEPROMRfACCKChnl1TxPwLevel[0] = EEPROM_Default_TxPowerLevel;
-                               priv->EEPROMRfACCKChnl1TxPwLevel[1] = EEPROM_Default_TxPowerLevel;
-                               priv->EEPROMRfACCKChnl1TxPwLevel[2] = EEPROM_Default_TxPowerLevel;
-
-                               priv->EEPROMRfAOfdmChnlTxPwLevel[0] = EEPROM_Default_TxPowerLevel;
-                               priv->EEPROMRfAOfdmChnlTxPwLevel[1] = EEPROM_Default_TxPowerLevel;
-                               priv->EEPROMRfAOfdmChnlTxPwLevel[2] = EEPROM_Default_TxPowerLevel;
-
-                               priv->EEPROMRfCCCKChnl1TxPwLevel[0] = EEPROM_Default_TxPowerLevel;
-                               priv->EEPROMRfCCCKChnl1TxPwLevel[1] = EEPROM_Default_TxPowerLevel;
-                               priv->EEPROMRfCCCKChnl1TxPwLevel[2] = EEPROM_Default_TxPowerLevel;
-
-                               priv->EEPROMRfCOfdmChnlTxPwLevel[0] = EEPROM_Default_TxPowerLevel;
-                               priv->EEPROMRfCOfdmChnlTxPwLevel[1] = EEPROM_Default_TxPowerLevel;
-                               priv->EEPROMRfCOfdmChnlTxPwLevel[2] = EEPROM_Default_TxPowerLevel;
-                       }
-                       RT_TRACE(COMP_INIT, "priv->EEPROMRfACCKChnl1TxPwLevel[0] = 0x%x\n", priv->EEPROMRfACCKChnl1TxPwLevel[0]);
-                       RT_TRACE(COMP_INIT, "priv->EEPROMRfACCKChnl1TxPwLevel[1] = 0x%x\n", priv->EEPROMRfACCKChnl1TxPwLevel[1]);
-                       RT_TRACE(COMP_INIT, "priv->EEPROMRfACCKChnl1TxPwLevel[2] = 0x%x\n", priv->EEPROMRfACCKChnl1TxPwLevel[2]);
-                       RT_TRACE(COMP_INIT, "priv->EEPROMRfAOfdmChnlTxPwLevel[0] = 0x%x\n", priv->EEPROMRfAOfdmChnlTxPwLevel[0]);
-                       RT_TRACE(COMP_INIT, "priv->EEPROMRfAOfdmChnlTxPwLevel[1] = 0x%x\n", priv->EEPROMRfAOfdmChnlTxPwLevel[1]);
-                       RT_TRACE(COMP_INIT, "priv->EEPROMRfAOfdmChnlTxPwLevel[2] = 0x%x\n", priv->EEPROMRfAOfdmChnlTxPwLevel[2]);
-                       RT_TRACE(COMP_INIT, "priv->EEPROMRfCCCKChnl1TxPwLevel[0] = 0x%x\n", priv->EEPROMRfCCCKChnl1TxPwLevel[0]);
-                       RT_TRACE(COMP_INIT, "priv->EEPROMRfCCCKChnl1TxPwLevel[1] = 0x%x\n", priv->EEPROMRfCCCKChnl1TxPwLevel[1]);
-                       RT_TRACE(COMP_INIT, "priv->EEPROMRfCCCKChnl1TxPwLevel[2] = 0x%x\n", priv->EEPROMRfCCCKChnl1TxPwLevel[2]);
-                       RT_TRACE(COMP_INIT, "priv->EEPROMRfCOfdmChnlTxPwLevel[0] = 0x%x\n", priv->EEPROMRfCOfdmChnlTxPwLevel[0]);
-                       RT_TRACE(COMP_INIT, "priv->EEPROMRfCOfdmChnlTxPwLevel[1] = 0x%x\n", priv->EEPROMRfCOfdmChnlTxPwLevel[1]);
-                       RT_TRACE(COMP_INIT, "priv->EEPROMRfCOfdmChnlTxPwLevel[2] = 0x%x\n", priv->EEPROMRfCOfdmChnlTxPwLevel[2]);
-#endif
 
-               }
                //
                // Update HAL variables.
                //
@@ -2580,10 +2249,6 @@ static void rtl8192_read_eeprom_info(struct net_device* dev)
                }
                else if(priv->epromtype == EPROM_93c56)
                {
-                       //char  cck_pwr_diff_a=0, cck_pwr_diff_c=0;
-
-                       //cck_pwr_diff_a = pHalData->EEPROMRfACCKChnl7TxPwLevel - pHalData->EEPROMRfAOfdmChnlTxPwLevel[1];
-                       //cck_pwr_diff_c = pHalData->EEPROMRfCCCKChnl7TxPwLevel - pHalData->EEPROMRfCOfdmChnlTxPwLevel[1];
                        for(i=0; i<3; i++)      // channel 1~3 use the same Tx Power Level.
                        {
                                priv->TxPowerLevelCCK_A[i]  = priv->EEPROMRfACCKChnl1TxPwLevel[0];
@@ -2626,11 +2291,11 @@ static void rtl8192_read_eeprom_info(struct net_device* dev)
 
        if(priv->rf_type == RF_1T2R)
        {
-               RT_TRACE(COMP_INIT, "\n1T2R config\n");
+               RT_TRACE(COMP_INIT, "1T2R config\n");
        }
        else if (priv->rf_type == RF_2T4R)
        {
-               RT_TRACE(COMP_INIT, "\n2T4R config\n");
+               RT_TRACE(COMP_INIT, "2T4R config\n");
        }
 
        // 2008/01/16 MH We can only know RF type in the function. So we have to init
@@ -2639,8 +2304,6 @@ static void rtl8192_read_eeprom_info(struct net_device* dev)
 
        //1 Make a copy for following variables and we can change them if we want
 
-       priv->rf_chip= RF_8256;
-
        if(priv->RegChannelPlan == 0xf)
        {
                priv->ChannelPlan = priv->eeprom_ChannelPlan;
@@ -2692,15 +2355,6 @@ static void rtl8192_read_eeprom_info(struct net_device* dev)
                        break;
 
                case EEPROM_CID_WHQL:
-                       //Adapter->bInHctTest = TRUE;//do not supported
-
-                       //priv->bSupportTurboMode = FALSE;
-                       //priv->bAutoTurboBy8186 = FALSE;
-
-                       //pMgntInfo->PowerSaveControl.bInactivePs = FALSE;
-                       //pMgntInfo->PowerSaveControl.bIPSModeBackup = FALSE;
-                       //pMgntInfo->PowerSaveControl.bLeisurePs = FALSE;
-
                        break;
                default:
                        // value from RegCustomerID
@@ -2711,54 +2365,6 @@ static void rtl8192_read_eeprom_info(struct net_device* dev)
        if(priv->ChannelPlan > CHANNEL_PLAN_LEN - 1)
                priv->ChannelPlan = 0; //FCC
 
-       switch(priv->CustomerID)
-       {
-               case RT_CID_DEFAULT:
-               #ifdef RTL8190P
-                       priv->LedStrategy = HW_LED;
-               #else
-                       #ifdef RTL8192E
-                       priv->LedStrategy = SW_LED_MODE1;
-                       #endif
-               #endif
-                       break;
-
-               case RT_CID_819x_CAMEO:
-                       priv->LedStrategy = SW_LED_MODE2;
-                       break;
-
-               case RT_CID_819x_RUNTOP:
-                       priv->LedStrategy = SW_LED_MODE3;
-                       break;
-
-               case RT_CID_819x_Netcore:
-                       priv->LedStrategy = SW_LED_MODE4;
-                       break;
-
-               case RT_CID_Nettronix:
-                       priv->LedStrategy = SW_LED_MODE5;
-                       break;
-
-               case RT_CID_PRONET:
-                       priv->LedStrategy = SW_LED_MODE6;
-                       break;
-
-               case RT_CID_TOSHIBA:   //Modify by Jacken 2008/01/31
-                       // Do nothing.
-                       //break;
-
-               default:
-               #ifdef RTL8190P
-                       priv->LedStrategy = HW_LED;
-               #else
-                       #ifdef RTL8192E
-                       priv->LedStrategy = SW_LED_MODE1;
-                       #endif
-               #endif
-                       break;
-       }
-
-
        if( priv->eeprom_vid == 0x1186 &&  priv->eeprom_did == 0x3304)
                priv->ieee80211->bSupportRemoteWakeUp = true;
        else
@@ -2766,17 +2372,13 @@ static void rtl8192_read_eeprom_info(struct net_device* dev)
 
 
        RT_TRACE(COMP_INIT, "RegChannelPlan(%d)\n", priv->RegChannelPlan);
-       RT_TRACE(COMP_INIT, "ChannelPlan = %d \n", priv->ChannelPlan);
-       RT_TRACE(COMP_INIT, "LedStrategy = %d \n", priv->LedStrategy);
+       RT_TRACE(COMP_INIT, "ChannelPlan = %d\n", priv->ChannelPlan);
        RT_TRACE(COMP_TRACE, "<==== ReadAdapterInfo\n");
-
-       return ;
 }
 
 
-static short rtl8192_get_channel_map(struct net_device * dev)
+static short rtl8192_get_channel_map(struct r8192_priv *priv)
 {
-       struct r8192_priv *priv = ieee80211_priv(dev);
 #ifdef ENABLE_DOT11D
        if(priv->ChannelPlan> COUNTRY_CODE_GLOBAL_DOMAIN){
                printk("rtl8180_init:Error channel plan! Set to default.\n");
@@ -2803,19 +2405,20 @@ static short rtl8192_get_channel_map(struct net_device * dev)
        return 0;
 }
 
-static short rtl8192_init(struct net_device *dev)
+static short rtl8192_init(struct r8192_priv *priv)
 {
-       struct r8192_priv *priv = ieee80211_priv(dev);
+       struct net_device *dev = priv->ieee80211->dev;
+
        memset(&(priv->stats),0,sizeof(struct Stats));
-       rtl8192_init_priv_variable(dev);
+       rtl8192_init_priv_variable(priv);
        rtl8192_init_priv_lock(priv);
-       rtl8192_init_priv_task(dev);
-       rtl8192_get_eeprom_size(dev);
-       rtl8192_read_eeprom_info(dev);
-       rtl8192_get_channel_map(dev);
+       rtl8192_init_priv_task(priv);
+       rtl8192_get_eeprom_size(priv);
+       rtl8192_read_eeprom_info(priv);
+       rtl8192_get_channel_map(priv);
        init_hal_dm(dev);
        init_timer(&priv->watch_dog_timer);
-       priv->watch_dog_timer.data = (unsigned long)dev;
+       priv->watch_dog_timer.data = (unsigned long)priv;
        priv->watch_dog_timer.function = watch_dog_timer_callback;
         if (request_irq(dev->irq, rtl8192_interrupt, IRQF_SHARED, dev->name, dev)) {
                printk("Error allocating IRQ %d",dev->irq);
@@ -2824,13 +2427,11 @@ static short rtl8192_init(struct net_device *dev)
                priv->irq=dev->irq;
                printk("IRQ %d",dev->irq);
        }
-       if(rtl8192_pci_initdescring(dev)!=0){
+       if (rtl8192_pci_initdescring(priv) != 0){
                printk("Endopoints initialization failed");
                return -1;
        }
 
-       //rtl8192_rx_enable(dev);
-       //rtl8192_adapter_start(dev);
        return 0;
 }
 
@@ -2839,15 +2440,14 @@ static short rtl8192_init(struct net_device *dev)
  *  not to do all the hw config as its name says
  * This part need to modified according to the rate set we filtered
  */
-static void rtl8192_hwconfig(struct net_device* dev)
+static void rtl8192_hwconfig(struct r8192_priv *priv)
 {
        u32 regRATR = 0, regRRSR = 0;
        u8 regBwOpMode = 0, regTmp = 0;
-       struct r8192_priv *priv = ieee80211_priv(dev);
 
 // Set RRSR, RATR, and BW_OPMODE registers
        //
-       switch(priv->ieee80211->mode)
+       switch (priv->ieee80211->mode)
        {
        case WIRELESS_MODE_B:
                regBwOpMode = BW_OPMODE_20MHZ;
@@ -2879,7 +2479,7 @@ static void rtl8192_hwconfig(struct net_device* dev)
                break;
        }
 
-       write_nic_byte(dev, BW_OPMODE, regBwOpMode);
+       write_nic_byte(priv, BW_OPMODE, regBwOpMode);
        {
                u32 ratr_value = 0;
                ratr_value = regRATR;
@@ -2887,17 +2487,17 @@ static void rtl8192_hwconfig(struct net_device* dev)
                {
                        ratr_value &= ~(RATE_ALL_OFDM_2SS);
                }
-               write_nic_dword(dev, RATR0, ratr_value);
-               write_nic_byte(dev, UFWP, 1);
+               write_nic_dword(priv, RATR0, ratr_value);
+               write_nic_byte(priv, UFWP, 1);
        }
-       regTmp = read_nic_byte(dev, 0x313);
+       regTmp = read_nic_byte(priv, 0x313);
        regRRSR = ((regTmp) << 24) | (regRRSR & 0x00ffffff);
-       write_nic_dword(dev, RRSR, regRRSR);
+       write_nic_dword(priv, RRSR, regRRSR);
 
        //
        // Set Retry Limit here
        //
-       write_nic_word(dev, RETRY_LIMIT,
+       write_nic_word(priv, RETRY_LIMIT,
                        priv->ShortRetryLimit << RETRY_LIMIT_SHORT_SHIFT |
                        priv->LongRetryLimit << RETRY_LIMIT_LONG_SHIFT);
        // Set Contention Window here
@@ -2912,39 +2512,32 @@ static void rtl8192_hwconfig(struct net_device* dev)
 }
 
 
-static RT_STATUS rtl8192_adapter_start(struct net_device *dev)
+static RT_STATUS rtl8192_adapter_start(struct r8192_priv *priv)
 {
-       struct r8192_priv *priv = ieee80211_priv(dev);
-//     struct ieee80211_device *ieee = priv->ieee80211;
+       struct net_device *dev = priv->ieee80211->dev;
        u32 ulRegRead;
        RT_STATUS rtStatus = RT_STATUS_SUCCESS;
-       //u8 eRFPath;
        u8 tmpvalue;
-#ifdef RTL8192E
        u8 ICVersion,SwitchingRegulatorOutput;
-#endif
        bool bfirmwareok = true;
-#ifdef RTL8190P
-       u8 ucRegRead;
-#endif
        u32     tmpRegA, tmpRegC, TempCCk;
        int     i =0;
 
        RT_TRACE(COMP_INIT, "====>%s()\n", __FUNCTION__);
        priv->being_init_adapter = true;
-        rtl8192_pci_resetdescring(dev);
+        rtl8192_pci_resetdescring(priv);
        // 2007/11/02 MH Before initalizing RF. We can not use FW to do RF-R/W.
        priv->Rf_Mode = RF_OP_By_SW_3wire;
-#ifdef RTL8192E
+
         //dPLL on
         if(priv->ResetProgress == RESET_TYPE_NORESET)
         {
-            write_nic_byte(dev, ANAPAR, 0x37);
+            write_nic_byte(priv, ANAPAR, 0x37);
             // Accordign to designer's explain, LBUS active will never > 10ms. We delay 10ms
             // Joseph increae the time to prevent firmware download fail
             mdelay(500);
         }
-#endif
+
        //PlatformSleepUs(10000);
        // For any kind of InitializeAdapter process, we shall use system now!!
        priv->pFirmware->firmware_status = FW_STATUS_0_INIT;
@@ -2953,7 +2546,7 @@ static RT_STATUS rtl8192_adapter_start(struct net_device *dev)
        //3 //Config CPUReset Register
        //3//
        //3 Firmware Reset Or Not
-       ulRegRead = read_nic_dword(dev, CPU_GEN);
+       ulRegRead = read_nic_dword(priv, CPU_GEN);
        if(priv->pFirmware->firmware_status == FW_STATUS_0_INIT)
        {       //called from MPInitialized. do nothing
                ulRegRead |= CPU_GEN_SYSTEM_RESET;
@@ -2962,42 +2555,32 @@ static RT_STATUS rtl8192_adapter_start(struct net_device *dev)
        else
                RT_TRACE(COMP_ERR, "ERROR in %s(): undefined firmware state(%d)\n", __FUNCTION__,   priv->pFirmware->firmware_status);
 
-#ifdef RTL8190P
-       //2008.06.03, for WOL 90 hw bug
-       ulRegRead &= (~(CPU_GEN_GPIO_UART));
-#endif
-
-       write_nic_dword(dev, CPU_GEN, ulRegRead);
-       //mdelay(100);
-
-#ifdef RTL8192E
+       write_nic_dword(priv, CPU_GEN, ulRegRead);
 
        //3//
        //3 //Fix the issue of E-cut high temperature issue
        //3//
        // TODO: E cut only
-       ICVersion = read_nic_byte(dev, IC_VERRSION);
+       ICVersion = read_nic_byte(priv, IC_VERRSION);
        if(ICVersion >= 0x4) //E-cut only
        {
                // HW SD suggest that we should not wirte this register too often, so driver
                // should readback this register. This register will be modified only when
                // power on reset
-               SwitchingRegulatorOutput = read_nic_byte(dev, SWREGULATOR);
+               SwitchingRegulatorOutput = read_nic_byte(priv, SWREGULATOR);
                if(SwitchingRegulatorOutput  != 0xb8)
                {
-                       write_nic_byte(dev, SWREGULATOR, 0xa8);
+                       write_nic_byte(priv, SWREGULATOR, 0xa8);
                        mdelay(1);
-                       write_nic_byte(dev, SWREGULATOR, 0xb8);
+                       write_nic_byte(priv, SWREGULATOR, 0xb8);
                }
        }
-#endif
-
 
        //3//
        //3// Initialize BB before MAC
        //3//
        RT_TRACE(COMP_INIT, "BB Config Start!\n");
-       rtStatus = rtl8192_BBConfig(dev);
+       rtStatus = rtl8192_BBConfig(priv);
        if(rtStatus != RT_STATUS_SUCCESS)
        {
                RT_TRACE(COMP_ERR, "BB Config failed\n");
@@ -3011,10 +2594,9 @@ static RT_STATUS rtl8192_adapter_start(struct net_device *dev)
        //      because setting of System_Reset bit reset MAC to default transmission mode.
                //Loopback mode or not
        priv->LoopbackMode = RTL819X_NO_LOOPBACK;
-       //priv->LoopbackMode = RTL819X_MAC_LOOPBACK;
        if(priv->ResetProgress == RESET_TYPE_NORESET)
        {
-       ulRegRead = read_nic_dword(dev, CPU_GEN);
+       ulRegRead = read_nic_dword(priv, CPU_GEN);
        if(priv->LoopbackMode == RTL819X_NO_LOOPBACK)
        {
                ulRegRead = ((ulRegRead & CPU_GEN_NO_LOOPBACK_MSK) | CPU_GEN_NO_LOOPBACK_SET);
@@ -3030,77 +2612,53 @@ static RT_STATUS rtl8192_adapter_start(struct net_device *dev)
 
        //2008.06.03, for WOL
        //ulRegRead &= (~(CPU_GEN_GPIO_UART));
-       write_nic_dword(dev, CPU_GEN, ulRegRead);
+       write_nic_dword(priv, CPU_GEN, ulRegRead);
 
        // 2006.11.29. After reset cpu, we sholud wait for a second, otherwise, it may fail to write registers. Emily
        udelay(500);
        }
        //3Set Hardware(Do nothing now)
-       rtl8192_hwconfig(dev);
+       rtl8192_hwconfig(priv);
        //2=======================================================
        // Common Setting for all of the FPGA platform. (part 1)
        //2=======================================================
        // If there is changes, please make sure it applies to all of the FPGA version
        //3 Turn on Tx/Rx
-       write_nic_byte(dev, CMDR, CR_RE|CR_TE);
+       write_nic_byte(priv, CMDR, CR_RE|CR_TE);
 
        //2Set Tx dma burst
-#ifdef RTL8190P
-       write_nic_byte(dev, PCIF, ((MXDMA2_NoLimit<<MXDMA2_RX_SHIFT) |
-                       (MXDMA2_NoLimit<<MXDMA2_TX_SHIFT) |
-                       (1<<MULRW_SHIFT)));
-#else
-       #ifdef RTL8192E
-       write_nic_byte(dev, PCIF, ((MXDMA2_NoLimit<<MXDMA2_RX_SHIFT) |
+       write_nic_byte(priv, PCIF, ((MXDMA2_NoLimit<<MXDMA2_RX_SHIFT) |
                                   (MXDMA2_NoLimit<<MXDMA2_TX_SHIFT) ));
-       #endif
-#endif
+
        //set IDR0 here
-       write_nic_dword(dev, MAC0, ((u32*)dev->dev_addr)[0]);
-       write_nic_word(dev, MAC4, ((u16*)(dev->dev_addr + 4))[0]);
+       write_nic_dword(priv, MAC0, ((u32*)dev->dev_addr)[0]);
+       write_nic_word(priv, MAC4, ((u16*)(dev->dev_addr + 4))[0]);
        //set RCR
-       write_nic_dword(dev, RCR, priv->ReceiveConfig);
+       write_nic_dword(priv, RCR, priv->ReceiveConfig);
 
        //3 Initialize Number of Reserved Pages in Firmware Queue
-       #ifdef TO_DO_LIST
-       if(priv->bInHctTest)
-       {
-               PlatformEFIOWrite4Byte(Adapter, RQPN1,  NUM_OF_PAGE_IN_FW_QUEUE_BK_DTM << RSVD_FW_QUEUE_PAGE_BK_SHIFT |
-                                       NUM_OF_PAGE_IN_FW_QUEUE_BE_DTM << RSVD_FW_QUEUE_PAGE_BE_SHIFT |
-                                       NUM_OF_PAGE_IN_FW_QUEUE_VI_DTM << RSVD_FW_QUEUE_PAGE_VI_SHIFT |
-                                       NUM_OF_PAGE_IN_FW_QUEUE_VO_DTM <<RSVD_FW_QUEUE_PAGE_VO_SHIFT);
-               PlatformEFIOWrite4Byte(Adapter, RQPN2, NUM_OF_PAGE_IN_FW_QUEUE_MGNT << RSVD_FW_QUEUE_PAGE_MGNT_SHIFT);
-               PlatformEFIOWrite4Byte(Adapter, RQPN3, APPLIED_RESERVED_QUEUE_IN_FW|
-                                       NUM_OF_PAGE_IN_FW_QUEUE_BCN<<RSVD_FW_QUEUE_PAGE_BCN_SHIFT|
-                                       NUM_OF_PAGE_IN_FW_QUEUE_PUB_DTM<<RSVD_FW_QUEUE_PAGE_PUB_SHIFT);
-       }
-       else
-       #endif
-       {
-               write_nic_dword(dev, RQPN1,  NUM_OF_PAGE_IN_FW_QUEUE_BK << RSVD_FW_QUEUE_PAGE_BK_SHIFT |
+               write_nic_dword(priv, RQPN1,  NUM_OF_PAGE_IN_FW_QUEUE_BK << RSVD_FW_QUEUE_PAGE_BK_SHIFT |
                                        NUM_OF_PAGE_IN_FW_QUEUE_BE << RSVD_FW_QUEUE_PAGE_BE_SHIFT |
                                        NUM_OF_PAGE_IN_FW_QUEUE_VI << RSVD_FW_QUEUE_PAGE_VI_SHIFT |
                                        NUM_OF_PAGE_IN_FW_QUEUE_VO <<RSVD_FW_QUEUE_PAGE_VO_SHIFT);
-               write_nic_dword(dev, RQPN2, NUM_OF_PAGE_IN_FW_QUEUE_MGNT << RSVD_FW_QUEUE_PAGE_MGNT_SHIFT);
-               write_nic_dword(dev, RQPN3, APPLIED_RESERVED_QUEUE_IN_FW|
+               write_nic_dword(priv, RQPN2, NUM_OF_PAGE_IN_FW_QUEUE_MGNT << RSVD_FW_QUEUE_PAGE_MGNT_SHIFT);
+               write_nic_dword(priv, RQPN3, APPLIED_RESERVED_QUEUE_IN_FW|
                                        NUM_OF_PAGE_IN_FW_QUEUE_BCN<<RSVD_FW_QUEUE_PAGE_BCN_SHIFT|
                                        NUM_OF_PAGE_IN_FW_QUEUE_PUB<<RSVD_FW_QUEUE_PAGE_PUB_SHIFT);
-       }
 
-       rtl8192_tx_enable(dev);
-       rtl8192_rx_enable(dev);
+       rtl8192_tx_enable(priv);
+       rtl8192_rx_enable(priv);
        //3Set Response Rate Setting Register
        // CCK rate is supported by default.
        // CCK rate will be filtered out only when associated AP does not support it.
-       ulRegRead = (0xFFF00000 & read_nic_dword(dev, RRSR))  | RATE_ALL_OFDM_AG | RATE_ALL_CCK;
-       write_nic_dword(dev, RRSR, ulRegRead);
-       write_nic_dword(dev, RATR0+4*7, (RATE_ALL_OFDM_AG | RATE_ALL_CCK));
+       ulRegRead = (0xFFF00000 & read_nic_dword(priv, RRSR))  | RATE_ALL_OFDM_AG | RATE_ALL_CCK;
+       write_nic_dword(priv, RRSR, ulRegRead);
+       write_nic_dword(priv, RATR0+4*7, (RATE_ALL_OFDM_AG | RATE_ALL_CCK));
 
        //2Set AckTimeout
        // TODO: (it value is only for FPGA version). need to be changed!!2006.12.18, by Emily
-       write_nic_byte(dev, ACK_TIMEOUT, 0x30);
+       write_nic_byte(priv, ACK_TIMEOUT, 0x30);
 
-       //rtl8192_actset_wirelessmode(dev,priv->RegWirelessMode);
        if(priv->ResetProgress == RESET_TYPE_NORESET)
        rtl8192_SetWirelessMode(dev, priv->ieee80211->mode);
        //-----------------------------------------------------------------------------
@@ -3108,38 +2666,38 @@ static RT_STATUS rtl8192_adapter_start(struct net_device *dev)
        // 1. Clear all H/W keys.
        // 2. Enable H/W encryption/decryption.
        //-----------------------------------------------------------------------------
-       CamResetAllEntry(dev);
+       CamResetAllEntry(priv);
        {
                u8 SECR_value = 0x0;
                SECR_value |= SCR_TxEncEnable;
                SECR_value |= SCR_RxDecEnable;
                SECR_value |= SCR_NoSKMC;
-               write_nic_byte(dev, SECR, SECR_value);
+               write_nic_byte(priv, SECR, SECR_value);
        }
        //3Beacon related
-       write_nic_word(dev, ATIMWND, 2);
-       write_nic_word(dev, BCN_INTERVAL, 100);
+       write_nic_word(priv, ATIMWND, 2);
+       write_nic_word(priv, BCN_INTERVAL, 100);
        for (i=0; i<QOS_QUEUE_NUM; i++)
-               write_nic_dword(dev, WDCAPARA_ADD[i], 0x005e4332);
+               write_nic_dword(priv, WDCAPARA_ADD[i], 0x005e4332);
        //
        // Switching regulator controller: This is set temporarily.
        // It's not sure if this can be removed in the future.
        // PJ advised to leave it by default.
        //
-       write_nic_byte(dev, 0xbe, 0xc0);
+       write_nic_byte(priv, 0xbe, 0xc0);
 
        //2=======================================================
        // Set PHY related configuration defined in MAC register bank
        //2=======================================================
-       rtl8192_phy_configmac(dev);
+       rtl8192_phy_configmac(priv);
 
        if (priv->card_8192_version > (u8) VERSION_8190_BD) {
-               rtl8192_phy_getTxPower(dev);
-               rtl8192_phy_setTxPower(dev, priv->chan);
+               rtl8192_phy_getTxPower(priv);
+               rtl8192_phy_setTxPower(priv, priv->chan);
        }
 
        //if D or C cut
-               tmpvalue = read_nic_byte(dev, IC_VERRSION);
+               tmpvalue = read_nic_byte(priv, IC_VERRSION);
                priv->IC_Cut = tmpvalue;
                RT_TRACE(COMP_INIT, "priv->IC_Cut = 0x%x\n", priv->IC_Cut);
                if(priv->IC_Cut >= IC_VersionCut_D)
@@ -3161,7 +2719,6 @@ static RT_STATUS rtl8192_adapter_start(struct net_device *dev)
                        RT_TRACE(COMP_INIT, "Before C-cut\n");
                }
 
-#if 1
        //Firmware download
        RT_TRACE(COMP_INIT, "Load Firmware!\n");
        bfirmwareok = init_firmware(dev);
@@ -3170,12 +2727,12 @@ static RT_STATUS rtl8192_adapter_start(struct net_device *dev)
                return rtStatus;
        }
        RT_TRACE(COMP_INIT, "Load Firmware finished!\n");
-#endif
+
        //RF config
        if(priv->ResetProgress == RESET_TYPE_NORESET)
        {
        RT_TRACE(COMP_INIT, "RF Config Started!\n");
-       rtStatus = rtl8192_phy_RFConfig(dev);
+       rtStatus = rtl8192_phy_RFConfig(priv);
        if(rtStatus != RT_STATUS_SUCCESS)
        {
                RT_TRACE(COMP_ERR, "RF Config failed\n");
@@ -3183,26 +2740,14 @@ static RT_STATUS rtl8192_adapter_start(struct net_device *dev)
        }
        RT_TRACE(COMP_INIT, "RF Config Finished!\n");
        }
-       rtl8192_phy_updateInitGain(dev);
+       rtl8192_phy_updateInitGain(priv);
 
        /*---- Set CCK and OFDM Block "ON"----*/
-       rtl8192_setBBreg(dev, rFPGA0_RFMOD, bCCKEn, 0x1);
-       rtl8192_setBBreg(dev, rFPGA0_RFMOD, bOFDMEn, 0x1);
+       rtl8192_setBBreg(priv, rFPGA0_RFMOD, bCCKEn, 0x1);
+       rtl8192_setBBreg(priv, rFPGA0_RFMOD, bOFDMEn, 0x1);
 
-#ifdef RTL8192E
        //Enable Led
-       write_nic_byte(dev, 0x87, 0x0);
-#endif
-#ifdef RTL8190P
-       //2008.06.03, for WOL
-       ucRegRead = read_nic_byte(dev, GPE);
-       ucRegRead |= BIT0;
-       write_nic_byte(dev, GPE, ucRegRead);
-
-       ucRegRead = read_nic_byte(dev, GPO);
-       ucRegRead &= ~BIT0;
-       write_nic_byte(dev, GPO, ucRegRead);
-#endif
+       write_nic_byte(priv, 0x87, 0x0);
 
        //2=======================================================
        // RF Power Save
@@ -3210,107 +2755,38 @@ static RT_STATUS rtl8192_adapter_start(struct net_device *dev)
 #ifdef ENABLE_IPS
 
 {
-       if(priv->ieee80211->RfOffReason > RF_CHANGE_BY_PS)
+       if(priv->RfOffReason > RF_CHANGE_BY_PS)
        { // H/W or S/W RF OFF before sleep.
-               RT_TRACE((COMP_INIT|COMP_RF|COMP_POWER), "%s(): Turn off RF for RfOffReason(%d) ----------\n", __FUNCTION__,priv->ieee80211->RfOffReason);
-               MgntActSet_RF_State(dev, eRfOff, priv->ieee80211->RfOffReason);
+               RT_TRACE((COMP_INIT|COMP_RF|COMP_POWER), "%s(): Turn off RF for RfOffReason(%d)\n", __FUNCTION__,priv->RfOffReason);
+               MgntActSet_RF_State(priv, eRfOff, priv->RfOffReason);
        }
-       else if(priv->ieee80211->RfOffReason >= RF_CHANGE_BY_IPS)
+       else if(priv->RfOffReason >= RF_CHANGE_BY_IPS)
        { // H/W or S/W RF OFF before sleep.
-               RT_TRACE((COMP_INIT|COMP_RF|COMP_POWER), "%s(): Turn off RF for RfOffReason(%d) ----------\n", __FUNCTION__,priv->ieee80211->RfOffReason);
-               MgntActSet_RF_State(dev, eRfOff, priv->ieee80211->RfOffReason);
+               RT_TRACE((COMP_INIT|COMP_RF|COMP_POWER), "%s(): Turn off RF for RfOffReason(%d)\n",  __FUNCTION__, priv->RfOffReason);
+               MgntActSet_RF_State(priv, eRfOff, priv->RfOffReason);
        }
        else
        {
                RT_TRACE((COMP_INIT|COMP_RF|COMP_POWER), "%s(): RF-ON \n",__FUNCTION__);
-               priv->ieee80211->eRFPowerState = eRfOn;
-               priv->ieee80211->RfOffReason = 0;
-               //DrvIFIndicateCurrentPhyStatus(Adapter);
-       // LED control
-       //Adapter->HalFunc.LedControlHandler(Adapter, LED_CTL_POWER_ON);
-
-       //
-       // If inactive power mode is enabled, disable rf while in disconnected state.
-       // But we should still tell upper layer we are in rf on state.
-       // 2007.07.16, by shien chang.
-       //
-               //if(!Adapter->bInHctTest)
-       //IPSEnter(Adapter);
-
+               priv->eRFPowerState = eRfOn;
+               priv->RfOffReason = 0;
        }
 }
 #endif
-       if(1){
-#ifdef RTL8192E
-                       // We can force firmware to do RF-R/W
-                       if(priv->ieee80211->FwRWRF)
-                               priv->Rf_Mode = RF_OP_By_FW;
-                       else
-                               priv->Rf_Mode = RF_OP_By_SW_3wire;
-#else
-                       priv->Rf_Mode = RF_OP_By_SW_3wire;
-#endif
-       }
-#ifdef RTL8190P
-       if(priv->ResetProgress == RESET_TYPE_NORESET)
-       {
-               dm_initialize_txpower_tracking(dev);
-
-               tmpRegA= rtl8192_QueryBBReg(dev,rOFDM0_XATxIQImbalance,bMaskDWord);
-               tmpRegC= rtl8192_QueryBBReg(dev,rOFDM0_XCTxIQImbalance,bMaskDWord);
-
-               if(priv->rf_type == RF_2T4R){
-               for(i = 0; i<TxBBGainTableLength; i++)
-               {
-                       if(tmpRegA == priv->txbbgain_table[i].txbbgain_value)
-                       {
-                               priv->rfa_txpowertrackingindex= (u8)i;
-                               priv->rfa_txpowertrackingindex_real= (u8)i;
-                               priv->rfa_txpowertracking_default = priv->rfa_txpowertrackingindex;
-                               break;
-                       }
-               }
-               }
-               for(i = 0; i<TxBBGainTableLength; i++)
-               {
-                       if(tmpRegC == priv->txbbgain_table[i].txbbgain_value)
-                       {
-                               priv->rfc_txpowertrackingindex= (u8)i;
-                               priv->rfc_txpowertrackingindex_real= (u8)i;
-                               priv->rfc_txpowertracking_default = priv->rfc_txpowertrackingindex;
-                               break;
-                       }
-               }
-               TempCCk = rtl8192_QueryBBReg(dev, rCCK0_TxFilter1, bMaskByte2);
+       // We can force firmware to do RF-R/W
+       if(priv->ieee80211->FwRWRF)
+               priv->Rf_Mode = RF_OP_By_FW;
+       else
+               priv->Rf_Mode = RF_OP_By_SW_3wire;
 
-               for(i=0 ; i<CCKTxBBGainTableLength ; i++)
-               {
-                       if(TempCCk == priv->cck_txbbgain_table[i].ccktxbb_valuearray[0])
-                       {
-                               priv->CCKPresentAttentuation_20Mdefault =(u8) i;
-                               break;
-                       }
-               }
-               priv->CCKPresentAttentuation_40Mdefault = 0;
-               priv->CCKPresentAttentuation_difference = 0;
-               priv->CCKPresentAttentuation = priv->CCKPresentAttentuation_20Mdefault;
-               RT_TRACE(COMP_POWER_TRACKING, "priv->rfa_txpowertrackingindex_initial = %d\n", priv->rfa_txpowertrackingindex);
-               RT_TRACE(COMP_POWER_TRACKING, "priv->rfa_txpowertrackingindex_real__initial = %d\n", priv->rfa_txpowertrackingindex_real);
-               RT_TRACE(COMP_POWER_TRACKING, "priv->rfc_txpowertrackingindex_initial = %d\n", priv->rfc_txpowertrackingindex);
-               RT_TRACE(COMP_POWER_TRACKING, "priv->rfc_txpowertrackingindex_real_initial = %d\n", priv->rfc_txpowertrackingindex_real);
-               RT_TRACE(COMP_POWER_TRACKING, "priv->CCKPresentAttentuation_difference_initial = %d\n", priv->CCKPresentAttentuation_difference);
-               RT_TRACE(COMP_POWER_TRACKING, "priv->CCKPresentAttentuation_initial = %d\n", priv->CCKPresentAttentuation);
-       }
-#else
-       #ifdef RTL8192E
        if(priv->ResetProgress == RESET_TYPE_NORESET)
        {
-               dm_initialize_txpower_tracking(dev);
+               dm_initialize_txpower_tracking(priv);
 
                if(priv->IC_Cut >= IC_VersionCut_D)
                {
-                       tmpRegA= rtl8192_QueryBBReg(dev,rOFDM0_XATxIQImbalance,bMaskDWord);
-                       tmpRegC= rtl8192_QueryBBReg(dev,rOFDM0_XCTxIQImbalance,bMaskDWord);
+                       tmpRegA = rtl8192_QueryBBReg(priv, rOFDM0_XATxIQImbalance, bMaskDWord);
+                       tmpRegC = rtl8192_QueryBBReg(priv, rOFDM0_XCTxIQImbalance, bMaskDWord);
                        for(i = 0; i<TxBBGainTableLength; i++)
                        {
                                if(tmpRegA == priv->txbbgain_table[i].txbbgain_value)
@@ -3322,7 +2798,7 @@ static RT_STATUS rtl8192_adapter_start(struct net_device *dev)
                                }
                        }
 
-               TempCCk = rtl8192_QueryBBReg(dev, rCCK0_TxFilter1, bMaskByte2);
+               TempCCk = rtl8192_QueryBBReg(priv, rCCK0_TxFilter1, bMaskByte2);
 
                for(i=0 ; i<CCKTxBBGainTableLength ; i++)
                {
@@ -3342,23 +2818,21 @@ static RT_STATUS rtl8192_adapter_start(struct net_device *dev)
                        priv->btxpower_tracking = FALSE;//TEMPLY DISABLE
                }
        }
-       #endif
-#endif
-       rtl8192_irq_enable(dev);
+
+       rtl8192_irq_enable(priv);
        priv->being_init_adapter = false;
        return rtStatus;
 
 }
 
-static void rtl8192_prepare_beacon(struct r8192_priv *priv)
+static void rtl8192_prepare_beacon(unsigned long arg)
 {
+       struct r8192_priv *priv = (struct r8192_priv*) arg;
        struct sk_buff *skb;
-       //unsigned long flags;
        cb_desc *tcb_desc;
 
        skb = ieee80211_get_beacon(priv->ieee80211);
        tcb_desc = (cb_desc *)(skb->cb + 8);
-       //spin_lock_irqsave(&priv->tx_lock,flags);
        /* prepare misc info for the beacon xmit */
        tcb_desc->queue_index = BEACON_QUEUE;
        /* IBSS does not support HT yet, use 1M defaultly */
@@ -3369,9 +2843,8 @@ static void rtl8192_prepare_beacon(struct r8192_priv *priv)
 
        skb_push(skb, priv->ieee80211->tx_headroom);
        if(skb){
-               rtl8192_tx(priv->ieee80211->dev,skb);
+               rtl8192_tx(privskb);
        }
-       //spin_unlock_irqrestore (&priv->tx_lock, flags);
 }
 
 
@@ -3389,150 +2862,93 @@ static void rtl8192_start_beacon(struct net_device *dev)
         u16 BcnIFS = 0xf;
 
        DMESG("Enabling beacon TX");
-       //rtl8192_prepare_beacon(dev);
-       rtl8192_irq_disable(dev);
+       rtl8192_irq_disable(priv);
        //rtl8192_beacon_tx_enable(dev);
 
        /* ATIM window */
-       write_nic_word(dev, ATIMWND, 2);
+       write_nic_word(priv, ATIMWND, 2);
 
        /* Beacon interval (in unit of TU) */
-       write_nic_word(dev, BCN_INTERVAL, net->beacon_interval);
+       write_nic_word(priv, BCN_INTERVAL, net->beacon_interval);
 
        /*
         * DrvErlyInt (in unit of TU).
         * (Time to send interrupt to notify driver to c
         * hange beacon content)
         * */
-       write_nic_word(dev, BCN_DRV_EARLY_INT, 10);
+       write_nic_word(priv, BCN_DRV_EARLY_INT, 10);
 
        /*
         * BcnDMATIM(in unit of us).
         * Indicates the time before TBTT to perform beacon queue DMA
         * */
-       write_nic_word(dev, BCN_DMATIME, 256);
+       write_nic_word(priv, BCN_DMATIME, 256);
 
        /*
         * Force beacon frame transmission even after receiving
         * beacon frame from other ad hoc STA
         * */
-       write_nic_byte(dev, BCN_ERR_THRESH, 100);
+       write_nic_byte(priv, BCN_ERR_THRESH, 100);
 
        /* Set CW and IFS */
        BcnTimeCfg |= BcnCW<<BCN_TCFG_CW_SHIFT;
        BcnTimeCfg |= BcnIFS<<BCN_TCFG_IFS;
-       write_nic_word(dev, BCN_TCFG, BcnTimeCfg);
+       write_nic_word(priv, BCN_TCFG, BcnTimeCfg);
 
 
        /* enable the interrupt for ad-hoc process */
-       rtl8192_irq_enable(dev);
+       rtl8192_irq_enable(priv);
 }
 
-static bool HalTxCheckStuck8190Pci(struct net_device *dev)
+static bool HalRxCheckStuck8190Pci(struct r8192_priv *priv)
 {
-       u16                             RegTxCounter = read_nic_word(dev, 0x128);
-       struct r8192_priv *priv = ieee80211_priv(dev);
+       u16 RegRxCounter = read_nic_word(priv, 0x130);
        bool                            bStuck = FALSE;
-       RT_TRACE(COMP_RESET,"%s():RegTxCounter is %d,TxCounter is %d\n",__FUNCTION__,RegTxCounter,priv->TxCounter);
-       if(priv->TxCounter==RegTxCounter)
-               bStuck = TRUE;
 
-       priv->TxCounter = RegTxCounter;
-
-       return bStuck;
-}
-
-/*
- * Assumption: RT_TX_SPINLOCK is acquired.
- */
-static RESET_TYPE
-TxCheckStuck(struct net_device *dev)
-{
-       struct r8192_priv *priv = ieee80211_priv(dev);
-       u8                      ResetThreshold = NIC_SEND_HANG_THRESHOLD_POWERSAVE;
-       bool                    bCheckFwTxCnt = false;
-
-       //
-       // Decide Stuch threshold according to current power save mode
-       //
-       switch (priv->ieee80211->dot11PowerSaveMode)
-       {
-               // The threshold value  may required to be adjusted .
-               case eActive:           // Active/Continuous access.
-                       ResetThreshold = NIC_SEND_HANG_THRESHOLD_NORMAL;
-                       break;
-               case eMaxPs:            // Max power save mode.
-                       ResetThreshold = NIC_SEND_HANG_THRESHOLD_POWERSAVE;
-                       break;
-               case eFastPs:   // Fast power save mode.
-                       ResetThreshold = NIC_SEND_HANG_THRESHOLD_POWERSAVE;
-                       break;
-       }
-
-#if 1
-       if(bCheckFwTxCnt)
-       {
-               if(HalTxCheckStuck8190Pci(dev))
-               {
-                       RT_TRACE(COMP_RESET, "TxCheckStuck(): Fw indicates no Tx condition! \n");
-                       return RESET_TYPE_SILENT;
-               }
-       }
-#endif
-       return RESET_TYPE_NORESET;
-}
-
-
-static bool HalRxCheckStuck8190Pci(struct net_device *dev)
-{
-       struct r8192_priv *priv = ieee80211_priv(dev);
-       u16                             RegRxCounter = read_nic_word(dev, 0x130);
-       bool                            bStuck = FALSE;
-       static u8                       rx_chk_cnt = 0;
-       RT_TRACE(COMP_RESET,"%s(): RegRxCounter is %d,RxCounter is %d\n",__FUNCTION__,RegRxCounter,priv->RxCounter);
-       // If rssi is small, we should check rx for long time because of bad rx.
-       // or maybe it will continuous silent reset every 2 seconds.
-       rx_chk_cnt++;
-       if(priv->undecorated_smoothed_pwdb >= (RateAdaptiveTH_High+5))
-       {
-               rx_chk_cnt = 0; //high rssi, check rx stuck right now.
-       }
-       else if(priv->undecorated_smoothed_pwdb < (RateAdaptiveTH_High+5) &&
-               ((priv->CurrentChannelBW!=HT_CHANNEL_WIDTH_20&&priv->undecorated_smoothed_pwdb>=RateAdaptiveTH_Low_40M) ||
-               (priv->CurrentChannelBW==HT_CHANNEL_WIDTH_20&&priv->undecorated_smoothed_pwdb>=RateAdaptiveTH_Low_20M)) )
+       RT_TRACE(COMP_RESET,"%s(): RegRxCounter is %d,RxCounter is %d\n",__FUNCTION__,RegRxCounter,priv->RxCounter);
+       // If rssi is small, we should check rx for long time because of bad rx.
+       // or maybe it will continuous silent reset every 2 seconds.
+       priv->rx_chk_cnt++;
+       if(priv->undecorated_smoothed_pwdb >= (RateAdaptiveTH_High+5))
+       {
+               priv->rx_chk_cnt = 0;   /* high rssi, check rx stuck right now. */
+       }
+       else if(priv->undecorated_smoothed_pwdb < (RateAdaptiveTH_High+5) &&
+               ((priv->CurrentChannelBW!=HT_CHANNEL_WIDTH_20&&priv->undecorated_smoothed_pwdb>=RateAdaptiveTH_Low_40M) ||
+               (priv->CurrentChannelBW==HT_CHANNEL_WIDTH_20&&priv->undecorated_smoothed_pwdb>=RateAdaptiveTH_Low_20M)) )
 
        {
-               if(rx_chk_cnt < 2)
+               if(priv->rx_chk_cnt < 2)
                {
                        return bStuck;
                }
                else
                {
-                       rx_chk_cnt = 0;
+                       priv->rx_chk_cnt = 0;
                }
        }
        else if(((priv->CurrentChannelBW!=HT_CHANNEL_WIDTH_20&&priv->undecorated_smoothed_pwdb<RateAdaptiveTH_Low_40M) ||
                (priv->CurrentChannelBW==HT_CHANNEL_WIDTH_20&&priv->undecorated_smoothed_pwdb<RateAdaptiveTH_Low_20M)) &&
                priv->undecorated_smoothed_pwdb >= VeryLowRSSI)
        {
-               if(rx_chk_cnt < 4)
+               if(priv->rx_chk_cnt < 4)
                {
                        return bStuck;
                }
                else
                {
-                       rx_chk_cnt = 0;
+                       priv->rx_chk_cnt = 0;
                }
        }
        else
        {
-               if(rx_chk_cnt < 8)
+               if(priv->rx_chk_cnt < 8)
                {
                        return bStuck;
                }
                else
                {
-                       rx_chk_cnt = 0;
+                       priv->rx_chk_cnt = 0;
                }
        }
        if(priv->RxCounter==RegRxCounter)
@@ -3543,10 +2959,10 @@ static bool HalRxCheckStuck8190Pci(struct net_device *dev)
        return bStuck;
 }
 
-static RESET_TYPE RxCheckStuck(struct net_device *dev)
+static RESET_TYPE RxCheckStuck(struct r8192_priv *priv)
 {
 
-       if(HalRxCheckStuck8190Pci(dev))
+       if(HalRxCheckStuck8190Pci(priv))
        {
                RT_TRACE(COMP_RESET, "RxStuck Condition\n");
                return RESET_TYPE_SILENT;
@@ -3555,319 +2971,39 @@ static RESET_TYPE RxCheckStuck(struct net_device *dev)
        return RESET_TYPE_NORESET;
 }
 
-static RESET_TYPE
-rtl819x_ifcheck_resetornot(struct net_device *dev)
+static RESET_TYPE rtl819x_check_reset(struct r8192_priv *priv)
 {
-       struct r8192_priv *priv = ieee80211_priv(dev);
-       RESET_TYPE      TxResetType = RESET_TYPE_NORESET;
-       RESET_TYPE      RxResetType = RESET_TYPE_NORESET;
-       RT_RF_POWER_STATE       rfState;
-
-       rfState = priv->ieee80211->eRFPowerState;
+       RESET_TYPE RxResetType = RESET_TYPE_NORESET;
+       RT_RF_POWER_STATE rfState;
 
-       TxResetType = TxCheckStuck(dev);
-#if 1
-       if( rfState != eRfOff &&
-               /*ADAPTER_TEST_STATUS_FLAG(Adapter, ADAPTER_STATUS_FW_DOWNLOAD_FAILURE)) &&*/
-               (priv->ieee80211->iw_mode != IW_MODE_ADHOC))
-       {
-               // If driver is in the status of firmware download failure , driver skips RF initialization and RF is
-               // in turned off state. Driver should check whether Rx stuck and do silent reset. And
-               // if driver is in firmware download failure status, driver should initialize RF in the following
-               // silent reset procedure Emily, 2008.01.21
+       rfState = priv->eRFPowerState;
 
-               // Driver should not check RX stuck in IBSS mode because it is required to
-               // set Check BSSID in order to send beacon, however, if check BSSID is
-               // set, STA cannot hear any packet a all. Emily, 2008.04.12
-               RxResetType = RxCheckStuck(dev);
-       }
-#endif
-
-       RT_TRACE(COMP_RESET,"%s(): TxResetType is %d, RxResetType is %d\n",__FUNCTION__,TxResetType,RxResetType);
-       if(TxResetType==RESET_TYPE_NORMAL || RxResetType==RESET_TYPE_NORMAL)
-               return RESET_TYPE_NORMAL;
-       else if(TxResetType==RESET_TYPE_SILENT || RxResetType==RESET_TYPE_SILENT)
-               return RESET_TYPE_SILENT;
-       else
-               return RESET_TYPE_NORESET;
-
-}
-
-
-static void CamRestoreAllEntry(struct net_device *dev)
-{
-       u8 EntryId = 0;
-       struct r8192_priv *priv = ieee80211_priv(dev);
-       const u8*       MacAddr = priv->ieee80211->current_network.bssid;
-
-       static const u8 CAM_CONST_ADDR[4][6] = {
-               {0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-               {0x00, 0x00, 0x00, 0x00, 0x00, 0x01},
-               {0x00, 0x00, 0x00, 0x00, 0x00, 0x02},
-               {0x00, 0x00, 0x00, 0x00, 0x00, 0x03}};
-       static const u8 CAM_CONST_BROAD[] =
-               {0xff, 0xff, 0xff, 0xff, 0xff, 0xff};
-
-       RT_TRACE(COMP_SEC, "CamRestoreAllEntry: \n");
-
-
-       if ((priv->ieee80211->pairwise_key_type == KEY_TYPE_WEP40)||
-           (priv->ieee80211->pairwise_key_type == KEY_TYPE_WEP104))
-       {
-
-               for(EntryId=0; EntryId<4; EntryId++)
-               {
-                       {
-                               MacAddr = CAM_CONST_ADDR[EntryId];
-                               setKey(dev,
-                                               EntryId ,
-                                               EntryId,
-                                               priv->ieee80211->pairwise_key_type,
-                                               MacAddr,
-                                               0,
-                                               NULL);
-                       }
-               }
-
-       }
-       else if(priv->ieee80211->pairwise_key_type == KEY_TYPE_TKIP)
-       {
-
-               {
-                       if(priv->ieee80211->iw_mode == IW_MODE_ADHOC)
-                               setKey(dev,
-                                               4,
-                                               0,
-                                               priv->ieee80211->pairwise_key_type,
-                                               (u8*)dev->dev_addr,
-                                               0,
-                                               NULL);
-                       else
-                               setKey(dev,
-                                               4,
-                                               0,
-                                               priv->ieee80211->pairwise_key_type,
-                                               MacAddr,
-                                               0,
-                                               NULL);
-               }
-       }
-       else if(priv->ieee80211->pairwise_key_type == KEY_TYPE_CCMP)
-       {
-
-               {
-                       if(priv->ieee80211->iw_mode == IW_MODE_ADHOC)
-                               setKey(dev,
-                                               4,
-                                               0,
-                                               priv->ieee80211->pairwise_key_type,
-                                               (u8*)dev->dev_addr,
-                                               0,
-                                               NULL);
-                       else
-                               setKey(dev,
-                                               4,
-                                               0,
-                                               priv->ieee80211->pairwise_key_type,
-                                               MacAddr,
-                                               0,
-                                               NULL);
-               }
-       }
-
-
-
-       if(priv->ieee80211->group_key_type == KEY_TYPE_TKIP)
-       {
-               MacAddr = CAM_CONST_BROAD;
-               for(EntryId=1 ; EntryId<4 ; EntryId++)
-               {
-                       {
-                               setKey(dev,
-                                               EntryId,
-                                               EntryId,
-                                               priv->ieee80211->group_key_type,
-                                               MacAddr,
-                                               0,
-                                               NULL);
-                       }
-               }
-               if(priv->ieee80211->iw_mode == IW_MODE_ADHOC)
-                               setKey(dev,
-                                               0,
-                                               0,
-                                               priv->ieee80211->group_key_type,
-                                               CAM_CONST_ADDR[0],
-                                               0,
-                                               NULL);
-       }
-       else if(priv->ieee80211->group_key_type == KEY_TYPE_CCMP)
-       {
-               MacAddr = CAM_CONST_BROAD;
-               for(EntryId=1; EntryId<4 ; EntryId++)
-               {
-                       {
-                               setKey(dev,
-                                               EntryId ,
-                                               EntryId,
-                                               priv->ieee80211->group_key_type,
-                                               MacAddr,
-                                               0,
-                                               NULL);
-                       }
-               }
-
-               if(priv->ieee80211->iw_mode == IW_MODE_ADHOC)
-                               setKey(dev,
-                                               0 ,
-                                               0,
-                                               priv->ieee80211->group_key_type,
-                                               CAM_CONST_ADDR[0],
-                                               0,
-                                               NULL);
+       if (rfState != eRfOff && (priv->ieee80211->iw_mode != IW_MODE_ADHOC)) {
+               /*
+                * If driver is in the status of firmware download failure,
+                * driver skips RF initialization and RF is in turned off state.
+                * Driver should check whether Rx stuck and do silent reset. And
+                * if driver is in firmware download failure status, driver
+                * should initialize RF in the following silent reset procedure
+                *
+                * Driver should not check RX stuck in IBSS mode because it is
+                * required to set Check BSSID in order to send beacon, however,
+                * if check BSSID is set, STA cannot hear any packet a all.
+                */
+               RxResetType = RxCheckStuck(priv);
        }
-}
-
-/*
- * This function is used to fix Tx/Rx stop bug temporarily.
- * This function will do "system reset" to NIC when Tx or Rx is stuck.
- * The method checking Tx/Rx stuck of this function is supported by FW,
- * which reports Tx and Rx counter to register 0x128 and 0x130.
- */
-static void rtl819x_ifsilentreset(struct net_device *dev)
-{
-       struct r8192_priv *priv = ieee80211_priv(dev);
-       u8      reset_times = 0;
-       int reset_status = 0;
-       struct ieee80211_device *ieee = priv->ieee80211;
-
-
-       return;
-
-       // 2007.07.20. If we need to check CCK stop, please uncomment this line.
-       //bStuck = Adapter->HalFunc.CheckHWStopHandler(Adapter);
-
-       if(priv->ResetProgress==RESET_TYPE_NORESET)
-       {
-RESET_START:
-#ifdef ENABLE_LPS
-                //LZM for PS-Poll AID issue. 090429
-                if(priv->ieee80211->state == IEEE80211_LINKED)
-                    LeisurePSLeave(dev);
-#endif
-
-               RT_TRACE(COMP_RESET,"=========>Reset progress!! \n");
-
-               // Set the variable for reset.
-               priv->ResetProgress = RESET_TYPE_SILENT;
-//             rtl8192_close(dev);
-#if 1
-               down(&priv->wx_sem);
-               if(priv->up == 0)
-               {
-                       RT_TRACE(COMP_ERR,"%s():the driver is not up! return\n",__FUNCTION__);
-                       up(&priv->wx_sem);
-                       return ;
-               }
-               priv->up = 0;
-               RT_TRACE(COMP_RESET,"%s():======>start to down the driver\n",__FUNCTION__);
-               if(!netif_queue_stopped(dev))
-                       netif_stop_queue(dev);
-
-               dm_backup_dynamic_mechanism_state(dev);
-
-               rtl8192_irq_disable(dev);
-               rtl8192_cancel_deferred_work(priv);
-               deinit_hal_dm(dev);
-               del_timer_sync(&priv->watch_dog_timer);
-               ieee->sync_scan_hurryup = 1;
-               if(ieee->state == IEEE80211_LINKED)
-               {
-                       down(&ieee->wx_sem);
-                       printk("ieee->state is IEEE80211_LINKED\n");
-                       ieee80211_stop_send_beacons(priv->ieee80211);
-                       del_timer_sync(&ieee->associate_timer);
-                        cancel_delayed_work(&ieee->associate_retry_wq);
-                       ieee80211_stop_scan(ieee);
-                       up(&ieee->wx_sem);
-               }
-               else{
-                       printk("ieee->state is NOT LINKED\n");
-                       ieee80211_softmac_stop_protocol(priv->ieee80211,true);
-               }
-               rtl8192_halt_adapter(dev, true);
-               up(&priv->wx_sem);
-               RT_TRACE(COMP_RESET,"%s():<==========down process is finished\n",__FUNCTION__);
-               RT_TRACE(COMP_RESET,"%s():===========>start to up the driver\n",__FUNCTION__);
-               reset_status = _rtl8192_up(dev);
-
-               RT_TRACE(COMP_RESET,"%s():<===========up process is finished\n",__FUNCTION__);
-               if(reset_status == -1)
-               {
-                       if(reset_times < 3)
-                       {
-                               reset_times++;
-                               goto RESET_START;
-                       }
-                       else
-                       {
-                               RT_TRACE(COMP_ERR," ERR!!! %s():  Reset Failed!!\n",__FUNCTION__);
-                       }
-               }
-#endif
-               ieee->is_silent_reset = 1;
-#if 1
-               EnableHWSecurityConfig8192(dev);
-#if 1
-               if(ieee->state == IEEE80211_LINKED && ieee->iw_mode == IW_MODE_INFRA)
-               {
-                       ieee->set_chan(ieee->dev, ieee->current_network.channel);
-
-#if 1
-                       queue_work(ieee->wq, &ieee->associate_complete_wq);
-#endif
-
-               }
-               else if(ieee->state == IEEE80211_LINKED && ieee->iw_mode == IW_MODE_ADHOC)
-               {
-                       ieee->set_chan(ieee->dev, ieee->current_network.channel);
-                       ieee->link_change(ieee->dev);
-
-               //      notify_wx_assoc_event(ieee);
-
-                       ieee80211_start_send_beacons(ieee);
-
-                       if (ieee->data_hard_resume)
-                               ieee->data_hard_resume(ieee->dev);
-                       netif_carrier_on(ieee->dev);
-               }
-#endif
-
-               CamRestoreAllEntry(dev);
-
-               // Restore the previous setting for all dynamic mechanism
-               dm_restore_dynamic_mechanism_state(dev);
-
-               priv->ResetProgress = RESET_TYPE_NORESET;
-               priv->reset_count++;
 
-               priv->bForcedSilentReset =false;
-               priv->bResetInProgress = false;
+       RT_TRACE(COMP_RESET, "%s():  RxResetType is %d\n", __FUNCTION__, RxResetType);
 
-               // For test --> force write UFWP.
-               write_nic_byte(dev, UFWP, 1);
-               RT_TRACE(COMP_RESET, "Reset finished!! ====>[%d]\n", priv->reset_count);
-#endif
-       }
+       return RxResetType;
 }
 
 #ifdef ENABLE_IPS
-void InactivePsWorkItemCallback(struct net_device *dev)
+static void InactivePsWorkItemCallback(struct r8192_priv *priv)
 {
-       struct r8192_priv *priv = ieee80211_priv(dev);
-       PRT_POWER_SAVE_CONTROL  pPSC = (PRT_POWER_SAVE_CONTROL)(&(priv->ieee80211->PowerSaveControl));
+       PRT_POWER_SAVE_CONTROL pPSC = &priv->PowerSaveControl;
 
-       RT_TRACE(COMP_POWER, "InactivePsWorkItemCallback() ---------> \n");
+       RT_TRACE(COMP_POWER, "InactivePsWorkItemCallback() --------->\n");
        //
        // This flag "bSwRfProcessing", indicates the status of IPS procedure, should be set if the IPS workitem
        // is really scheduled.
@@ -3882,20 +3018,19 @@ void InactivePsWorkItemCallback(struct net_device *dev)
                        pPSC->eInactivePowerState == eRfOff?"OFF":"ON");
 
 
-       MgntActSet_RF_State(dev, pPSC->eInactivePowerState, RF_CHANGE_BY_IPS);
+       MgntActSet_RF_State(priv, pPSC->eInactivePowerState, RF_CHANGE_BY_IPS);
 
        //
        // To solve CAM values miss in RF OFF, rewrite CAM values after RF ON. By Bruce, 2007-09-20.
        //
        pPSC->bSwRfProcessing = FALSE;
-       RT_TRACE(COMP_POWER, "InactivePsWorkItemCallback() <--------- \n");
+       RT_TRACE(COMP_POWER, "InactivePsWorkItemCallback() <---------\n");
 }
 
 #ifdef ENABLE_LPS
 /* Change current and default preamble mode. */
-bool MgntActSet_802_11_PowerSaveMode(struct net_device *dev,   u8 rtPsMode)
+bool MgntActSet_802_11_PowerSaveMode(struct r8192_priv *priv, u8 rtPsMode)
 {
-       struct r8192_priv *priv = ieee80211_priv(dev);
 
        // Currently, we do not change power save mode on IBSS mode.
        if(priv->ieee80211->iw_mode == IW_MODE_ADHOC)
@@ -3921,17 +3056,14 @@ bool MgntActSet_802_11_PowerSaveMode(struct net_device *dev,    u8 rtPsMode)
        // Awake immediately
        if(priv->ieee80211->sta_sleep != 0 && rtPsMode == IEEE80211_PS_DISABLED)
        {
-                unsigned long flags;
-
-               //PlatformSetTimer(Adapter, &(pMgntInfo->AwakeTimer), 0);
                // Notify the AP we awke.
-               rtl8192_hw_wakeup(dev);
+               rtl8192_hw_wakeup(priv->ieee80211->dev);
                priv->ieee80211->sta_sleep = 0;
 
-                spin_lock_irqsave(&(priv->ieee80211->mgmt_tx_lock), flags);
+                spin_lock(&priv->ieee80211->mgmt_tx_lock);
                printk("LPS leave: notify AP we are awaked ++++++++++ SendNullFunctionData\n");
                ieee80211_sta_ps_send_null_frame(priv->ieee80211, 0);
-                spin_unlock_irqrestore(&(priv->ieee80211->mgmt_tx_lock), flags);
+                spin_unlock(&priv->ieee80211->mgmt_tx_lock);
        }
 
        return true;
@@ -3941,11 +3073,7 @@ bool MgntActSet_802_11_PowerSaveMode(struct net_device *dev,     u8 rtPsMode)
 void LeisurePSEnter(struct net_device *dev)
 {
        struct r8192_priv *priv = ieee80211_priv(dev);
-       PRT_POWER_SAVE_CONTROL pPSC = (PRT_POWER_SAVE_CONTROL)(&(priv->ieee80211->PowerSaveControl));
-
-       //RT_TRACE(COMP_PS, "LeisurePSEnter()...\n");
-       //RT_TRACE(COMP_PS, "pPSC->bLeisurePs = %d, ieee->ps = %d,pPSC->LpsIdleCount is %d,RT_CHECK_FOR_HANG_PERIOD is %d\n",
-       //      pPSC->bLeisurePs, priv->ieee80211->ps,pPSC->LpsIdleCount,RT_CHECK_FOR_HANG_PERIOD);
+       PRT_POWER_SAVE_CONTROL pPSC = &priv->PowerSaveControl;
 
        if(!((priv->ieee80211->iw_mode == IW_MODE_INFRA) &&
                (priv->ieee80211->state == IEEE80211_LINKED)) ||
@@ -3961,9 +3089,7 @@ void LeisurePSEnter(struct net_device *dev)
 
                        if(priv->ieee80211->ps == IEEE80211_PS_DISABLED)
                        {
-
-                               //RT_TRACE(COMP_LPS, "LeisurePSEnter(): Enter 802.11 power save mode...\n");
-                               MgntActSet_802_11_PowerSaveMode(dev, IEEE80211_PS_MBCAST|IEEE80211_PS_UNICAST);
+                               MgntActSet_802_11_PowerSaveMode(priv, IEEE80211_PS_MBCAST|IEEE80211_PS_UNICAST);
 
                        }
                }
@@ -3977,15 +3103,14 @@ void LeisurePSEnter(struct net_device *dev)
 void LeisurePSLeave(struct net_device *dev)
 {
        struct r8192_priv *priv = ieee80211_priv(dev);
-       PRT_POWER_SAVE_CONTROL pPSC = (PRT_POWER_SAVE_CONTROL)(&(priv->ieee80211->PowerSaveControl));
+       PRT_POWER_SAVE_CONTROL pPSC = &priv->PowerSaveControl;
 
        if (pPSC->bLeisurePs)
        {
                if(priv->ieee80211->ps != IEEE80211_PS_DISABLED)
                {
                        // move to lps_wakecomplete()
-                       //RT_TRACE(COMP_LPS, "LeisurePSLeave(): Busy Traffic , Leave 802.11 power save..\n");
-                       MgntActSet_802_11_PowerSaveMode(dev, IEEE80211_PS_DISABLED);
+                       MgntActSet_802_11_PowerSaveMode(priv, IEEE80211_PS_DISABLED);
 
                }
        }
@@ -3994,16 +3119,14 @@ void LeisurePSLeave(struct net_device *dev)
 
 
 /* Enter the inactive power save mode. RF will be off */
-void
-IPSEnter(struct net_device *dev)
+void IPSEnter(struct r8192_priv *priv)
 {
-       struct r8192_priv *priv = ieee80211_priv(dev);
-       PRT_POWER_SAVE_CONTROL          pPSC = (PRT_POWER_SAVE_CONTROL)(&(priv->ieee80211->PowerSaveControl));
+       PRT_POWER_SAVE_CONTROL pPSC = &priv->PowerSaveControl;
        RT_RF_POWER_STATE                       rtState;
 
        if (pPSC->bInactivePs)
        {
-               rtState = priv->ieee80211->eRFPowerState;
+               rtState = priv->eRFPowerState;
                //
                // Added by Bruce, 2007-12-25.
                // Do not enter IPS in the following conditions:
@@ -4019,7 +3142,7 @@ IPSEnter(struct net_device *dev)
                        RT_TRACE(COMP_RF,"IPSEnter(): Turn off RF.\n");
                        pPSC->eInactivePowerState = eRfOff;
 //                     queue_work(priv->priv_wq,&(pPSC->InactivePsWorkItem));
-                       InactivePsWorkItemCallback(dev);
+                       InactivePsWorkItemCallback(priv);
                }
        }
 }
@@ -4029,34 +3152,31 @@ IPSEnter(struct net_device *dev)
 //             Leave the inactive power save mode, RF will be on.
 //     2007.08.17, by shien chang.
 //
-void
-IPSLeave(struct net_device *dev)
+void IPSLeave(struct r8192_priv *priv)
 {
-       struct r8192_priv *priv = ieee80211_priv(dev);
-       PRT_POWER_SAVE_CONTROL  pPSC = (PRT_POWER_SAVE_CONTROL)(&(priv->ieee80211->PowerSaveControl));
+       PRT_POWER_SAVE_CONTROL pPSC = &priv->PowerSaveControl;
        RT_RF_POWER_STATE       rtState;
 
        if (pPSC->bInactivePs)
        {
-               rtState = priv->ieee80211->eRFPowerState;
-               if (rtState != eRfOn  && !pPSC->bSwRfProcessing && priv->ieee80211->RfOffReason <= RF_CHANGE_BY_IPS)
+               rtState = priv->eRFPowerState;
+               if (rtState != eRfOn && !pPSC->bSwRfProcessing && priv->RfOffReason <= RF_CHANGE_BY_IPS)
                {
                        RT_TRACE(COMP_POWER, "IPSLeave(): Turn on RF.\n");
                        pPSC->eInactivePowerState = eRfOn;
-//                     queue_work(priv->priv_wq,&(pPSC->InactivePsWorkItem));
-                       InactivePsWorkItemCallback(dev);
+                       InactivePsWorkItemCallback(priv);
                }
        }
 }
 
-void IPSLeave_wq(void *data)
+void IPSLeave_wq(struct work_struct *work)
 {
-       struct ieee80211_device *ieee = container_of(data,struct ieee80211_device,ips_leave_wq);
+       struct ieee80211_device *ieee = container_of(work, struct ieee80211_device, ips_leave_wq);
        struct net_device *dev = ieee->dev;
 
        struct r8192_priv *priv = (struct r8192_priv *)ieee80211_priv(dev);
        down(&priv->ieee80211->ips_sem);
-       IPSLeave(dev);
+       IPSLeave(priv);
        up(&priv->ieee80211->ips_sem);
 }
 
@@ -4064,11 +3184,11 @@ void ieee80211_ips_leave_wq(struct net_device *dev)
 {
        struct r8192_priv *priv = (struct r8192_priv *)ieee80211_priv(dev);
        RT_RF_POWER_STATE       rtState;
-       rtState = priv->ieee80211->eRFPowerState;
+       rtState = priv->eRFPowerState;
 
-       if(priv->ieee80211->PowerSaveControl.bInactivePs){
+       if (priv->PowerSaveControl.bInactivePs){
                if(rtState == eRfOff){
-                       if(priv->ieee80211->RfOffReason > RF_CHANGE_BY_IPS)
+                       if(priv->RfOffReason > RF_CHANGE_BY_IPS)
                        {
                                RT_TRACE(COMP_ERR, "%s(): RF is OFF.\n",__FUNCTION__);
                                return;
@@ -4085,7 +3205,7 @@ void ieee80211_ips_leave(struct net_device *dev)
 {
        struct r8192_priv *priv = (struct r8192_priv *)ieee80211_priv(dev);
        down(&priv->ieee80211->ips_sem);
-       IPSLeave(dev);
+       IPSLeave(priv);
        up(&priv->ieee80211->ips_sem);
 }
 #endif
@@ -4116,13 +3236,10 @@ static void rtl819x_watchdog_wqcallback(struct work_struct *work)
 {
        struct delayed_work *dwork = container_of(work,struct delayed_work,work);
        struct r8192_priv *priv = container_of(dwork,struct r8192_priv,watch_dog_wq);
-       struct net_device *dev = priv->ieee80211->dev;
+       struct net_device *dev = priv->ieee80211->dev;
        struct ieee80211_device* ieee = priv->ieee80211;
        RESET_TYPE      ResetType = RESET_TYPE_NORESET;
-       static u8       check_reset_cnt=0;
-       unsigned long flags;
        bool bBusyTraffic = false;
-       static u8 last_time = 0;
        bool bEnterPS = false;
 
        if ((!priv->up) || priv->bHwRadioOff)
@@ -4134,11 +3251,10 @@ static void rtl819x_watchdog_wqcallback(struct work_struct *work)
 #ifdef ENABLE_IPS
        if(ieee->actscanning == false){
                if((ieee->iw_mode == IW_MODE_INFRA) && (ieee->state == IEEE80211_NOLINK) &&
-                   (ieee->eRFPowerState == eRfOn)&&!ieee->is_set_key &&
+                   (priv->eRFPowerState == eRfOn) && !ieee->is_set_key &&
                    (!ieee->proto_stoppping) && !ieee->wx_set_enc){
-                       if(ieee->PowerSaveControl.ReturnPoint == IPS_CALLBACK_NONE){
-                               IPSEnter(dev);
-                               //ieee80211_stop_scan(priv->ieee80211);
+                       if (priv->PowerSaveControl.ReturnPoint == IPS_CALLBACK_NONE){
+                               IPSEnter(priv);
                        }
                }
        }
@@ -4178,7 +3294,6 @@ static void rtl819x_watchdog_wqcallback(struct work_struct *work)
                else
                {
 #ifdef ENABLE_LPS
-                       //RT_TRACE(COMP_LPS,"====>no link LPS leave\n");
                        LeisurePSLeave(dev);
 #endif
                }
@@ -4191,8 +3306,6 @@ static void rtl819x_watchdog_wqcallback(struct work_struct *work)
 
 
        //added by amy for AP roaming
-       if (1)
-       {
                if(ieee->state == IEEE80211_LINKED && ieee->iw_mode == IW_MODE_INFRA)
                {
                        u32     TotalRxBcnNum = 0;
@@ -4201,7 +3314,7 @@ static void rtl819x_watchdog_wqcallback(struct work_struct *work)
                        rtl819x_update_rxcounts(priv, &TotalRxBcnNum, &TotalRxDataNum);
                        if((TotalRxBcnNum+TotalRxDataNum) == 0)
                        {
-                               if( ieee->eRFPowerState == eRfOff)
+                               if (priv->eRFPowerState == eRfOff)
                                        RT_TRACE(COMP_ERR,"========>%s()\n",__FUNCTION__);
                                printk("===>%s(): AP is power off,connect another one\n",__FUNCTION__);
                                //              Dot11d_Reset(dev);
@@ -4217,15 +3330,13 @@ static void rtl819x_watchdog_wqcallback(struct work_struct *work)
              ieee->LinkDetectInfo.NumRecvBcnInPeriod=0;
               ieee->LinkDetectInfo.NumRecvDataInPeriod=0;
 
-       }
        //check if reset the driver
-       spin_lock_irqsave(&priv->tx_lock,flags);
-       if(check_reset_cnt++ >= 3 && !ieee->is_roaming && (last_time != 1))
+       if (priv->watchdog_check_reset_cnt++ >= 3 && !ieee->is_roaming && 
+           priv->watchdog_last_time != 1)
        {
-               ResetType = rtl819x_ifcheck_resetornot(dev);
-               check_reset_cnt = 3;
+               ResetType = rtl819x_check_reset(priv);
+               priv->watchdog_check_reset_cnt = 3;
        }
-       spin_unlock_irqrestore(&priv->tx_lock,flags);
        if(!priv->bDisableNormalResetCheck && ResetType == RESET_TYPE_NORMAL)
        {
                priv->ResetProgress = RESET_TYPE_NORMAL;
@@ -4233,15 +3344,14 @@ static void rtl819x_watchdog_wqcallback(struct work_struct *work)
                return;
        }
        /* disable silent reset temply 2008.9.11*/
-#if 1
+
        if( ((priv->force_reset) || (!priv->bDisableNormalResetCheck && ResetType==RESET_TYPE_SILENT))) // This is control by OID set in Pomelo
        {
-               last_time = 1;
-               rtl819x_ifsilentreset(dev);
+               priv->watchdog_last_time = 1;
        }
        else
-               last_time = 0;
-#endif
+               priv->watchdog_last_time = 0;
+
        priv->force_reset = false;
        priv->bForcedSilentReset = false;
        priv->bResetInProgress = false;
@@ -4251,37 +3361,37 @@ static void rtl819x_watchdog_wqcallback(struct work_struct *work)
 
 void watch_dog_timer_callback(unsigned long data)
 {
-       struct r8192_priv *priv = ieee80211_priv((struct net_device *) data);
+       struct r8192_priv *priv = (struct r8192_priv *) data;
        queue_delayed_work(priv->priv_wq,&priv->watch_dog_wq,0);
        mod_timer(&priv->watch_dog_timer, jiffies + MSECS(IEEE80211_WATCH_DOG_TIME));
 
 }
 
-static int _rtl8192_up(struct net_device *dev)
+static int _rtl8192_up(struct r8192_priv *priv)
 {
-       struct r8192_priv *priv = ieee80211_priv(dev);
-       //int i;
        RT_STATUS init_status = RT_STATUS_SUCCESS;
+       struct net_device *dev = priv->ieee80211->dev;
+
        priv->up=1;
        priv->ieee80211->ieee_up=1;
        priv->bdisable_nic = false;  //YJ,add,091111
-       RT_TRACE(COMP_INIT, "Bringing up iface");
+       RT_TRACE(COMP_INIT, "Bringing up iface\n");
 
-       init_status = rtl8192_adapter_start(dev);
+       init_status = rtl8192_adapter_start(priv);
        if(init_status != RT_STATUS_SUCCESS)
        {
                RT_TRACE(COMP_ERR,"ERR!!! %s(): initialization is failed!\n",__FUNCTION__);
                return -1;
        }
        RT_TRACE(COMP_INIT, "start adapter finished\n");
-#ifdef RTL8192E
-       if(priv->ieee80211->eRFPowerState!=eRfOn)
-               MgntActSet_RF_State(dev, eRfOn, priv->ieee80211->RfOffReason);
-#endif
+
+       if (priv->eRFPowerState != eRfOn)
+               MgntActSet_RF_State(priv, eRfOn, priv->RfOffReason);
+
        if(priv->ieee80211->state != IEEE80211_LINKED)
        ieee80211_softmac_start_protocol(priv->ieee80211);
        ieee80211_reset_queue(priv->ieee80211);
-       watch_dog_timer_callback((unsigned long) dev);
+       watch_dog_timer_callback((unsigned long) priv);
        if(!netif_queue_stopped(dev))
                netif_start_queue(dev);
        else
@@ -4310,7 +3420,7 @@ int rtl8192_up(struct net_device *dev)
 
        if (priv->up == 1) return -1;
 
-       return _rtl8192_up(dev);
+       return _rtl8192_up(priv);
 }
 
 
@@ -4348,14 +3458,14 @@ int rtl8192_down(struct net_device *dev)
        if (!netif_queue_stopped(dev))
                netif_stop_queue(dev);
 
-       rtl8192_irq_disable(dev);
+       rtl8192_irq_disable(priv);
        rtl8192_cancel_deferred_work(priv);
        deinit_hal_dm(dev);
        del_timer_sync(&priv->watch_dog_timer);
 
        ieee80211_softmac_stop_protocol(priv->ieee80211,true);
 
-       rtl8192_halt_adapter(dev,false);
+       rtl8192_halt_adapter(priv, false);
        memset(&priv->ieee80211->current_network, 0 , offsetof(struct ieee80211_network, list));
 
        RT_TRACE(COMP_DOWN, "<==========%s()\n", __FUNCTION__);
@@ -4364,28 +3474,25 @@ int rtl8192_down(struct net_device *dev)
 }
 
 
-void rtl8192_commit(struct net_device *dev)
+void rtl8192_commit(struct r8192_priv *priv)
 {
-       struct r8192_priv *priv = ieee80211_priv(dev);
-
        if (priv->up == 0) return ;
 
 
        ieee80211_softmac_stop_protocol(priv->ieee80211,true);
 
-       rtl8192_irq_disable(dev);
-       rtl8192_halt_adapter(dev,true);
-       _rtl8192_up(dev);
+       rtl8192_irq_disable(priv);
+       rtl8192_halt_adapter(priv, true);
+       _rtl8192_up(priv);
 }
 
 static void rtl8192_restart(struct work_struct *work)
 {
         struct r8192_priv *priv = container_of(work, struct r8192_priv, reset_wq);
-        struct net_device *dev = priv->ieee80211->dev;
 
        down(&priv->wx_sem);
 
-       rtl8192_commit(dev);
+       rtl8192_commit(priv);
 
        up(&priv->wx_sem);
 }
@@ -4393,23 +3500,8 @@ static void rtl8192_restart(struct work_struct *work)
 static void r8192_set_multicast(struct net_device *dev)
 {
        struct r8192_priv *priv = ieee80211_priv(dev);
-       short promisc;
-
-       //down(&priv->wx_sem);
-
-       /* FIXME FIXME */
-
-       promisc = (dev->flags & IFF_PROMISC) ? 1:0;
-
-       if (promisc != priv->promisc) {
-               ;
-       //      rtl8192_commit(dev);
-       }
-
-       priv->promisc = promisc;
 
-       //schedule_work(&priv->reset_wq);
-       //up(&priv->wx_sem);
+       priv->promisc = (dev->flags & IFF_PROMISC) ? 1 : 0;
 }
 
 
@@ -4428,15 +3520,74 @@ static int r8192_set_mac_adr(struct net_device *dev, void *mac)
        return 0;
 }
 
+static void r8192e_set_hw_key(struct r8192_priv *priv, struct ieee_param *ipw)
+{
+       struct ieee80211_device *ieee = priv->ieee80211;
+       u8 broadcast_addr[6] = {0xff,0xff,0xff,0xff,0xff,0xff};
+       u32 key[4];
+
+       if (ipw->u.crypt.set_tx) {
+               if (strcmp(ipw->u.crypt.alg, "CCMP") == 0)
+                       ieee->pairwise_key_type = KEY_TYPE_CCMP;
+               else if (strcmp(ipw->u.crypt.alg, "TKIP") == 0)
+                       ieee->pairwise_key_type = KEY_TYPE_TKIP;
+               else if (strcmp(ipw->u.crypt.alg, "WEP") == 0) {
+                       if (ipw->u.crypt.key_len == 13)
+                               ieee->pairwise_key_type = KEY_TYPE_WEP104;
+                       else if (ipw->u.crypt.key_len == 5)
+                               ieee->pairwise_key_type = KEY_TYPE_WEP40;
+               } else
+                       ieee->pairwise_key_type = KEY_TYPE_NA;
+
+               if (ieee->pairwise_key_type) {
+                       memcpy(key, ipw->u.crypt.key, 16);
+                       EnableHWSecurityConfig8192(priv);
+                       /*
+                        * We fill both index entry and 4th entry for pairwise
+                        * key as in IPW interface, adhoc will only get here,
+                        * so we need index entry for its default key serching!
+                        */
+                       setKey(priv, 4, ipw->u.crypt.idx,
+                              ieee->pairwise_key_type,
+                              (u8*)ieee->ap_mac_addr, 0, key);
+
+                       /* LEAP WEP will never set this. */
+                       if (ieee->auth_mode != 2)
+                               setKey(priv, 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(priv, 0x173, 1); /* fix aes bug */
+               }
+       } else {
+               memcpy(key, ipw->u.crypt.key, 16);
+               if (strcmp(ipw->u.crypt.alg, "CCMP") == 0)
+                       ieee->group_key_type= KEY_TYPE_CCMP;
+               else if (strcmp(ipw->u.crypt.alg, "TKIP") == 0)
+                       ieee->group_key_type = KEY_TYPE_TKIP;
+               else if (strcmp(ipw->u.crypt.alg, "WEP") == 0) {
+                       if (ipw->u.crypt.key_len == 13)
+                               ieee->group_key_type = KEY_TYPE_WEP104;
+                       else if (ipw->u.crypt.key_len == 5)
+                               ieee->group_key_type = KEY_TYPE_WEP40;
+               } else
+                       ieee->group_key_type = KEY_TYPE_NA;
+
+               if (ieee->group_key_type) {
+                       setKey(priv, ipw->u.crypt.idx, ipw->u.crypt.idx,
+                              ieee->group_key_type, broadcast_addr, 0, key);
+               }
+       }
+}
+
 /* based on ipw2200 driver */
 static int rtl8192_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)
 {
        struct r8192_priv *priv = (struct r8192_priv *)ieee80211_priv(dev);
        struct iwreq *wrq = (struct iwreq *)rq;
        int ret=-1;
-       struct ieee80211_device *ieee = priv->ieee80211;
-       u32 key[4];
-       u8 broadcast_addr[6] = {0xff,0xff,0xff,0xff,0xff,0xff};
        struct iw_point *p = &wrq->u.data;
        struct ieee_param *ipw = NULL;//(struct ieee_param *)wrq->u.data.pointer;
 
@@ -4460,74 +3611,14 @@ static int rtl8192_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)
      }
 
        switch (cmd) {
-           case RTL_IOCTL_WPA_SUPPLICANT:
-               //parse here for HW security
-                       if (ipw->cmd == IEEE_CMD_SET_ENCRYPTION)
-                       {
-                               if (ipw->u.crypt.set_tx)
-                               {
-                                       if (strcmp(ipw->u.crypt.alg, "CCMP") == 0)
-                                               ieee->pairwise_key_type = KEY_TYPE_CCMP;
-                                       else if (strcmp(ipw->u.crypt.alg, "TKIP") == 0)
-                                               ieee->pairwise_key_type = KEY_TYPE_TKIP;
-                                       else if (strcmp(ipw->u.crypt.alg, "WEP") == 0)
-                                       {
-                                               if (ipw->u.crypt.key_len == 13)
-                                                       ieee->pairwise_key_type = KEY_TYPE_WEP104;
-                                               else if (ipw->u.crypt.key_len == 5)
-                                                       ieee->pairwise_key_type = KEY_TYPE_WEP40;
-                                       }
-                                       else
-                                               ieee->pairwise_key_type = KEY_TYPE_NA;
-
-                                       if (ieee->pairwise_key_type)
-                                       {
-                                               memcpy((u8*)key, ipw->u.crypt.key, 16);
-                                               EnableHWSecurityConfig8192(dev);
-                                       //we fill both index entry and 4th entry for pairwise key as in IPW interface, adhoc will only get here, so we need index entry for its default key serching!
-                                       //added by WB.
-                                               setKey(dev, 4, ipw->u.crypt.idx, ieee->pairwise_key_type, (u8*)ieee->ap_mac_addr, 0, key);
-                                               if (ieee->auth_mode != 2)  //LEAP WEP will never set this.
-                                               setKey(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); //fix aes bug
-                                               }
-
-                               }
-                               else //if (ipw->u.crypt.idx) //group key use idx > 0
-                               {
-                                       memcpy((u8*)key, ipw->u.crypt.key, 16);
-                                       if (strcmp(ipw->u.crypt.alg, "CCMP") == 0)
-                                               ieee->group_key_type= KEY_TYPE_CCMP;
-                                       else if (strcmp(ipw->u.crypt.alg, "TKIP") == 0)
-                                               ieee->group_key_type = KEY_TYPE_TKIP;
-                                       else if (strcmp(ipw->u.crypt.alg, "WEP") == 0)
-                                       {
-                                               if (ipw->u.crypt.key_len == 13)
-                                                       ieee->group_key_type = KEY_TYPE_WEP104;
-                                               else if (ipw->u.crypt.key_len == 5)
-                                                       ieee->group_key_type = KEY_TYPE_WEP40;
-                                       }
-                                       else
-                                               ieee->group_key_type = KEY_TYPE_NA;
-
-                                       if (ieee->group_key_type)
-                                       {
-                                                       setKey( dev,
-                                                               ipw->u.crypt.idx,
-                                                               ipw->u.crypt.idx,               //KeyIndex
-                                                               ieee->group_key_type,   //KeyType
-                                                               broadcast_addr, //MacAddr
-                                                               0,              //DefaultKey
-                                                               key);           //KeyContent
-                                       }
-                               }
-                       }
+       case RTL_IOCTL_WPA_SUPPLICANT:
+               /* parse here for HW security */
+               if (ipw->cmd == IEEE_CMD_SET_ENCRYPTION)
+                       r8192e_set_hw_key(priv, ipw);
                ret = ieee80211_wpa_supplicant_ioctl(priv->ieee80211, &wrq->u.data);
                break;
 
-           default:
+       default:
                ret = -EOPNOTSUPP;
                break;
        }
@@ -4593,9 +3684,8 @@ static u8 HwRateToMRate90(bool bIsHT, u8 rate)
 }
 
 /* Record the TSF time stamp when receiving a packet */
-static void UpdateRxPktTimeStamp8190 (struct net_device *dev, struct ieee80211_rx_stats *stats)
+static void UpdateRxPktTimeStamp8190(struct r8192_priv *priv, struct ieee80211_rx_stats *stats)
 {
-       struct r8192_priv *priv = (struct r8192_priv *)ieee80211_priv(dev);
 
        if(stats->bIsAMPDU && !stats->bFirstMPDU) {
                stats->mac_time[0] = priv->LastRxDescTSFLow;
@@ -4617,67 +3707,6 @@ static long rtl819x_translate_todbm(u8 signal_strength_index)// 0-100 index.
        return signal_power;
 }
 
-static void
-rtl8190_process_cck_rxpathsel(
-       struct r8192_priv * priv,
-       struct ieee80211_rx_stats * pprevious_stats
-       )
-{
-#ifdef RTL8190P        //Only 90P 2T4R need to check
-       char                            last_cck_adc_pwdb[4]={0,0,0,0};
-       u8                              i;
-//cosa add for Rx path selection
-               if(priv->rf_type == RF_2T4R && DM_RxPathSelTable.Enable)
-               {
-                       if(pprevious_stats->bIsCCK &&
-                               (pprevious_stats->bPacketToSelf ||pprevious_stats->bPacketBeacon))
-                       {
-                               /* record the cck adc_pwdb to the sliding window. */
-                               if(priv->stats.cck_adc_pwdb.TotalNum++ >= PHY_RSSI_SLID_WIN_MAX)
-                               {
-                                       priv->stats.cck_adc_pwdb.TotalNum = PHY_RSSI_SLID_WIN_MAX;
-                                       for(i=RF90_PATH_A; i<RF90_PATH_MAX; i++)
-                                       {
-                                               last_cck_adc_pwdb[i] = priv->stats.cck_adc_pwdb.elements[i][priv->stats.cck_adc_pwdb.index];
-                                               priv->stats.cck_adc_pwdb.TotalVal[i] -= last_cck_adc_pwdb[i];
-                                       }
-                               }
-                               for(i=RF90_PATH_A; i<RF90_PATH_MAX; i++)
-                               {
-                                       priv->stats.cck_adc_pwdb.TotalVal[i] += pprevious_stats->cck_adc_pwdb[i];
-                                       priv->stats.cck_adc_pwdb.elements[i][priv->stats.cck_adc_pwdb.index] = pprevious_stats->cck_adc_pwdb[i];
-                               }
-                               priv->stats.cck_adc_pwdb.index++;
-                               if(priv->stats.cck_adc_pwdb.index >= PHY_RSSI_SLID_WIN_MAX)
-                                       priv->stats.cck_adc_pwdb.index = 0;
-
-                               for(i=RF90_PATH_A; i<RF90_PATH_MAX; i++)
-                               {
-                                       DM_RxPathSelTable.cck_pwdb_sta[i] = priv->stats.cck_adc_pwdb.TotalVal[i]/priv->stats.cck_adc_pwdb.TotalNum;
-                               }
-
-                               for(i=RF90_PATH_A; i<RF90_PATH_MAX; i++)
-                               {
-                                       if(pprevious_stats->cck_adc_pwdb[i]  > (char)priv->undecorated_smoothed_cck_adc_pwdb[i])
-                                       {
-                                               priv->undecorated_smoothed_cck_adc_pwdb[i] =
-                                                       ( (priv->undecorated_smoothed_cck_adc_pwdb[i]*(Rx_Smooth_Factor-1)) +
-                                                       (pprevious_stats->cck_adc_pwdb[i])) /(Rx_Smooth_Factor);
-                                               priv->undecorated_smoothed_cck_adc_pwdb[i] = priv->undecorated_smoothed_cck_adc_pwdb[i] + 1;
-                                       }
-                                       else
-                                       {
-                                               priv->undecorated_smoothed_cck_adc_pwdb[i] =
-                                                       ( (priv->undecorated_smoothed_cck_adc_pwdb[i]*(Rx_Smooth_Factor-1)) +
-                                                       (pprevious_stats->cck_adc_pwdb[i])) /(Rx_Smooth_Factor);
-                                       }
-                               }
-                       }
-               }
-#endif
-}
-
-
 /* 2008/01/22 MH We can not delcare RSSI/EVM total value of sliding window to
        be a local static. Otherwise, it may increase when we return from S3/S4. The
        value will be kept in memory or disk. We must delcare the value in adapter
@@ -4687,13 +3716,9 @@ static void rtl8192_process_phyinfo(struct r8192_priv * priv, u8* buffer,struct
        bool bcheck = false;
        u8      rfpath;
        u32 nspatial_stream, tmp_val;
-       //u8    i;
        static u32 slide_rssi_index=0, slide_rssi_statistics=0;
        static u32 slide_evm_index=0, slide_evm_statistics=0;
        static u32 last_rssi=0, last_evm=0;
-       //cosa add for rx path selection
-//     static long slide_cck_adc_pwdb_index=0, slide_cck_adc_pwdb_statistics=0;
-//     static char last_cck_adc_pwdb[4]={0,0,0,0};
        //cosa add for beacon rssi smoothing
        static u32 slide_beacon_adc_pwdb_index=0, slide_beacon_adc_pwdb_statistics=0;
        static u32 last_beacon_adc_pwdb=0;
@@ -4705,8 +3730,7 @@ static void rtl8192_process_phyinfo(struct r8192_priv * priv, u8* buffer,struct
        sc = le16_to_cpu(hdr->seq_ctl);
        frag = WLAN_GET_SEQ_FRAG(sc);
        seq = WLAN_GET_SEQ_SEQ(sc);
-       //cosa add 04292008 to record the sequence number
-       pcurrent_stats->Seq_Num = seq;
+
        //
        // Check whether we should take the previous packet into accounting
        //
@@ -4744,17 +3768,15 @@ static void rtl8192_process_phyinfo(struct r8192_priv * priv, u8* buffer,struct
        if(!bcheck)
                return;
 
-       rtl8190_process_cck_rxpathsel(priv,pprevious_stats);
-
        // <2> Showed on UI for engineering
        // hardware does not provide rssi information for each rf path in CCK
        if(!pprevious_stats->bIsCCK && pprevious_stats->bPacketToSelf)
        {
                for (rfpath = RF90_PATH_A; rfpath < RF90_PATH_C; rfpath++)
                {
-                       if (!rtl8192_phy_CheckIsLegalRFPath(priv->ieee80211->dev, rfpath))
+                       if (!rtl8192_phy_CheckIsLegalRFPath(priv, rfpath))
                                continue;
-                       RT_TRACE(COMP_DBG,"Jacken -> pPreviousstats->RxMIMOSignalStrength[rfpath]  = %d \n" ,pprevious_stats->RxMIMOSignalStrength[rfpath] );
+                       RT_TRACE(COMP_DBG, "pPreviousstats->RxMIMOSignalStrength[rfpath] = %d\n", pprevious_stats->RxMIMOSignalStrength[rfpath]);
                        //Fixed by Jacken 2008-03-20
                        if(priv->stats.rx_rssi_percentage[rfpath] == 0)
                        {
@@ -4773,7 +3795,7 @@ static void rtl8192_process_phyinfo(struct r8192_priv * priv, u8* buffer,struct
                                        ( (priv->stats.rx_rssi_percentage[rfpath]*(Rx_Smooth_Factor-1)) +
                                        (pprevious_stats->RxMIMOSignalStrength[rfpath])) /(Rx_Smooth_Factor);
                        }
-                       RT_TRACE(COMP_DBG,"Jacken -> priv->RxStats.RxRSSIPercentage[rfPath]  = %d \n" ,priv->stats.rx_rssi_percentage[rfpath] );
+                       RT_TRACE(COMP_DBG, "priv->RxStats.RxRSSIPercentage[rfPath] = %d \n" , priv->stats.rx_rssi_percentage[rfpath]);
                }
        }
 
@@ -4812,7 +3834,7 @@ static void rtl8192_process_phyinfo(struct r8192_priv * priv, u8* buffer,struct
                {
                        priv->undecorated_smoothed_pwdb = pprevious_stats->RxPWDBAll;
                }
-#if 1
+
                if(pprevious_stats->RxPWDBAll > (u32)priv->undecorated_smoothed_pwdb)
                {
                        priv->undecorated_smoothed_pwdb =
@@ -4826,20 +3848,6 @@ static void rtl8192_process_phyinfo(struct r8192_priv * priv, u8* buffer,struct
                                        ( ((priv->undecorated_smoothed_pwdb)*(Rx_Smooth_Factor-1)) +
                                        (pprevious_stats->RxPWDBAll)) /(Rx_Smooth_Factor);
                }
-#else
-               //Fixed by Jacken 2008-03-20
-               if(pPreviousRfd->Status.RxPWDBAll > (u32)pHalData->UndecoratedSmoothedPWDB)
-               {
-                       pHalData->UndecoratedSmoothedPWDB =
-                                       ( ((pHalData->UndecoratedSmoothedPWDB)* 5) + (pPreviousRfd->Status.RxPWDBAll)) / 6;
-                       pHalData->UndecoratedSmoothedPWDB = pHalData->UndecoratedSmoothedPWDB + 1;
-               }
-               else
-               {
-                       pHalData->UndecoratedSmoothedPWDB =
-                                       ( ((pHalData->UndecoratedSmoothedPWDB)* 5) + (pPreviousRfd->Status.RxPWDBAll)) / 6;
-               }
-#endif
        }
 
        //
@@ -5006,10 +4014,6 @@ static void rtl8192_query_rxphystatus(
        u8                              is_cck_rate=0;
        u8                              rf_rx_num = 0;
 
-       /* 2007/07/04 MH For OFDM RSSI. For high power or not. */
-       static  u8              check_reg824 = 0;
-       static  u32             reg824_bit9 = 0;
-
        is_cck_rate = rx_hal_is_cck_rate(pdrvinfo);
 
        // Record it for next packet processing
@@ -5020,10 +4024,10 @@ static void rtl8192_query_rxphystatus(
        pstats->bPacketBeacon = precord_stats->bPacketBeacon = bPacketBeacon;
        pstats->bToSelfBA = precord_stats->bToSelfBA = bToSelfBA;
        /*2007.08.30 requested by SD3 Jerry */
-       if(check_reg824 == 0)
+       if (priv->phy_check_reg824 == 0)
        {
-               reg824_bit9 = rtl8192_QueryBBReg(priv->ieee80211->dev, rFPGA0_XA_HSSIParameter2, 0x200);
-               check_reg824 = 1;
+               priv->phy_reg824_bit9 = rtl8192_QueryBBReg(priv, rFPGA0_XA_HSSIParameter2, 0x200);
+               priv->phy_check_reg824 = 1;
        }
 
 
@@ -5051,25 +4055,8 @@ static void rtl8192_query_rxphystatus(
                // (2)PWDB, Average PWDB cacluated by hardware (for rate adaptive)
                //
                u8 report;//, cck_agc_rpt;
-#ifdef RTL8190P
-               u8 tmp_pwdb;
-               char cck_adc_pwdb[4];
-#endif
-
-#ifdef RTL8190P        //Only 90P 2T4R need to check
-               if(priv->rf_type == RF_2T4R && DM_RxPathSelTable.Enable && bpacket_match_bssid)
-               {
-                       for(i=RF90_PATH_A; i<RF90_PATH_MAX; i++)
-                       {
-                               tmp_pwdb = pcck_buf->adc_pwdb_X[i];
-                               cck_adc_pwdb[i] = (char)tmp_pwdb;
-                               cck_adc_pwdb[i] /= 2;
-                               pstats->cck_adc_pwdb[i] = precord_stats->cck_adc_pwdb[i] = cck_adc_pwdb[i];
-                       }
-               }
-#endif
 
-               if(!reg824_bit9)
+               if (!priv->phy_reg824_bit9)
                {
                        report = pcck_buf->cck_agc_rpt & 0xc0;
                        report = report>>6;
@@ -5158,11 +4145,7 @@ static void rtl8192_query_rxphystatus(
 
                        //Fixed by Jacken from Bryant 2008-03-20
                        //Original value is 106
-#ifdef RTL8190P           //Modify by Jacken 2008/03/31
-                       rx_pwr[i] = ((pofdm_buf->trsw_gain_X[i]&0x3F)*2) - 106;
-#else
                        rx_pwr[i] = ((pofdm_buf->trsw_gain_X[i]&0x3F)*2) - 110;
-#endif
 
                        //Get Rx snr value in DB
                        tmp_rxsnr = pofdm_buf->rxsnr_X[i];
@@ -5252,22 +4235,19 @@ rtl8192_record_rxdesc_forlateruse(
 {
        ptarget_stats->bIsAMPDU = psrc_stats->bIsAMPDU;
        ptarget_stats->bFirstMPDU = psrc_stats->bFirstMPDU;
-       //ptarget_stats->Seq_Num = psrc_stats->Seq_Num;
 }
 
 
 
-static void TranslateRxSignalStuff819xpci(struct net_device *dev,
+static void TranslateRxSignalStuff819xpci(struct r8192_priv *priv,
         struct sk_buff *skb,
         struct ieee80211_rx_stats * pstats,
         prx_desc_819x_pci pdesc,
         prx_fwinfo_819x_pci pdrvinfo)
 {
     // TODO: We must only check packet for current MAC address. Not finish
-    struct r8192_priv *priv = (struct r8192_priv *)ieee80211_priv(dev);
     bool bpacket_match_bssid, bpacket_toself;
     bool bPacketBeacon=false, bToSelfBA=false;
-    static struct ieee80211_rx_stats  previous_stats;
     struct ieee80211_hdr_3addr *hdr;
     u16 fc,type;
 
@@ -5289,62 +4269,76 @@ static void TranslateRxSignalStuff819xpci(struct net_device *dev,
             (!compare_ether_addr(priv->ieee80211->current_network.bssid,       (fc & IEEE80211_FCTL_TODS)? hdr->addr1 : (fc & IEEE80211_FCTL_FROMDS )? hdr->addr2 : hdr->addr3))
             && (!pstats->bHwError) && (!pstats->bCRC)&& (!pstats->bICV));
     bpacket_toself =  bpacket_match_bssid & (!compare_ether_addr(praddr, priv->ieee80211->dev->dev_addr));
-#if 1//cosa
+
     if(WLAN_FC_GET_FRAMETYPE(fc)== IEEE80211_STYPE_BEACON)
     {
         bPacketBeacon = true;
     }
     if(WLAN_FC_GET_FRAMETYPE(fc) == IEEE80211_STYPE_BLOCKACK)
     {
-        if((!compare_ether_addr(praddr,dev->dev_addr)))
+        if (!compare_ether_addr(praddr, priv->ieee80211->dev->dev_addr))
             bToSelfBA = true;
     }
 
-#endif
-
     //
     // Process PHY information for previous packet (RSSI/PWDB/EVM)
     //
     // Because phy information is contained in the last packet of AMPDU only, so driver
     // should process phy information of previous packet
-    rtl8192_process_phyinfo(priv, tmp_buf,&previous_stats, pstats);
-    rtl8192_query_rxphystatus(priv, pstats, pdesc, pdrvinfo, &previous_stats, bpacket_match_bssid,
+    rtl8192_process_phyinfo(priv, tmp_buf, &priv->previous_stats, pstats);
+    rtl8192_query_rxphystatus(priv, pstats, pdesc, pdrvinfo, &priv->previous_stats, bpacket_match_bssid,
             bpacket_toself ,bPacketBeacon, bToSelfBA);
-    rtl8192_record_rxdesc_forlateruse(pstats, &previous_stats);
+    rtl8192_record_rxdesc_forlateruse(pstats, &priv->previous_stats);
 
 }
 
 
-static void rtl8192_tx_resume(struct net_device *dev)
+static void rtl8192_tx_resume(struct r8192_priv *priv)
 {
-       struct r8192_priv *priv = (struct r8192_priv *)ieee80211_priv(dev);
        struct ieee80211_device *ieee = priv->ieee80211;
+       struct net_device *dev = priv->ieee80211->dev;
        struct sk_buff *skb;
-       int queue_index;
+       int i;
 
-       for(queue_index = BK_QUEUE; queue_index < TXCMD_QUEUE;queue_index++) {
-               while((!skb_queue_empty(&ieee->skb_waitQ[queue_index]))&&
-                               (priv->ieee80211->check_nic_enough_desc(dev,queue_index) > 0)) {
+       for (i = BK_QUEUE; i < TXCMD_QUEUE; i++) {
+               while ((!skb_queue_empty(&ieee->skb_waitQ[i])) &&
+                      (priv->ieee80211->check_nic_enough_desc(dev, i) > 0)) {
                        /* 1. dequeue the packet from the wait queue */
-                       skb = skb_dequeue(&ieee->skb_waitQ[queue_index]);
+                       skb = skb_dequeue(&ieee->skb_waitQ[i]);
                        /* 2. tx the packet directly */
-                       ieee->softmac_data_hard_start_xmit(skb,dev,0/* rate useless now*/);
+                       ieee->softmac_data_hard_start_xmit(skb, dev, 0);
                }
        }
 }
 
-static void rtl8192_irq_tx_tasklet(struct r8192_priv *priv)
+static void rtl8192_irq_tx_tasklet(unsigned long arg)
 {
-       rtl8192_tx_resume(priv->ieee80211->dev);
+       struct r8192_priv *priv = (struct r8192_priv*) arg;
+       struct rtl8192_tx_ring *mgnt_ring = &priv->tx_ring[MGNT_QUEUE];
+       struct net_device *dev = priv->ieee80211->dev;
+       unsigned long flags;
+
+       /* check if we need to report that the management queue is drained */
+       spin_lock_irqsave(&priv->irq_th_lock, flags);
+
+       if (!skb_queue_len(&mgnt_ring->queue) &&
+           priv->ieee80211->ack_tx_to_ieee &&
+           rtl8192_is_tx_queue_empty(dev)) {
+               priv->ieee80211->ack_tx_to_ieee = 0;
+               ieee80211_ps_tx_ack(priv->ieee80211, 1);
+       }
+
+       spin_unlock_irqrestore(&priv->irq_th_lock, flags);
+
+       rtl8192_tx_resume(priv);
 }
 
 /* Record the received data rate */
 static void UpdateReceivedRateHistogramStatistics8190(
-       struct net_device *dev,
+       struct r8192_priv *priv,
        struct ieee80211_rx_stats* pstats
        )
 {
-       struct r8192_priv *priv = (struct r8192_priv *)ieee80211_priv(dev);
        u32 rcvType=1;   //0: Total, 1:OK, 2:CRC, 3:ICV
        u32 rateIndex;
        u32 preamble_guardinterval;  //1: short preamble/GI, 0: long preamble/GI
@@ -5404,9 +4398,8 @@ static void UpdateReceivedRateHistogramStatistics8190(
        priv->stats.received_rate_histogram[rcvType][rateIndex]++;
 }
 
-static void rtl8192_rx(struct net_device *dev)
+static void rtl8192_rx(struct r8192_priv *priv)
 {
-    struct r8192_priv *priv = (struct r8192_priv *)ieee80211_priv(dev);
     struct ieee80211_hdr_1addr *ieee80211_hdr = NULL;
     bool unicast_packet = false;
     struct ieee80211_rx_stats stats = {
@@ -5416,17 +4409,17 @@ static void rtl8192_rx(struct net_device *dev)
         .freq = IEEE80211_24GHZ_BAND,
     };
     unsigned int count = priv->rxringcount;
-
-    stats.nic_type = NIC_8192E;
+    prx_fwinfo_819x_pci pDrvInfo = NULL;
+    struct sk_buff *new_skb;
 
     while (count--) {
         rx_desc_819x_pci *pdesc = &priv->rx_ring[priv->rx_idx];//rx descriptor
         struct sk_buff *skb = priv->rx_buf[priv->rx_idx];//rx pkt
 
-        if (pdesc->OWN){
+        if (pdesc->OWN)
             /* wait data to be filled by hardware */
             return;
-        } else {
+
             stats.bICV = pdesc->ICV;
             stats.bCRC = pdesc->CRC32;
             stats.bHwError = pdesc->CRC32 | pdesc->ICV;
@@ -5438,13 +4431,12 @@ static void rtl8192_rx(struct net_device *dev)
             if(stats.bHwError) {
                 stats.bShift = false;
                 goto done;
-            } else {
-                prx_fwinfo_819x_pci pDrvInfo = NULL;
-                struct sk_buff *new_skb = dev_alloc_skb(priv->rxbuffersize);
+            }
+                pDrvInfo = NULL;
+                new_skb = dev_alloc_skb(priv->rxbuffersize);
 
-                if (unlikely(!new_skb)) {
+                if (unlikely(!new_skb))
                     goto done;
-                }
 
                 stats.RxDrvInfoSize = pdesc->RxDrvInfoSize;
                 stats.RxBufShift = ((pdesc->Shift)&0x03);
@@ -5464,15 +4456,15 @@ static void rtl8192_rx(struct net_device *dev)
                 /* it is debug only. It should be disabled in released driver.
                  * 2007.1.11 by Emily
                  * */
-                UpdateReceivedRateHistogramStatistics8190(dev, &stats);
+                UpdateReceivedRateHistogramStatistics8190(priv, &stats);
 
                 stats.bIsAMPDU = (pDrvInfo->PartAggr==1);
                 stats.bFirstMPDU = (pDrvInfo->PartAggr==1) && (pDrvInfo->FirstAGGR==1);
 
                 stats.TimeStampLow = pDrvInfo->TSFL;
-                stats.TimeStampHigh = read_nic_dword(dev, TSFR+4);
+                stats.TimeStampHigh = read_nic_dword(priv, TSFR+4);
 
-                UpdateRxPktTimeStamp8190(dev, &stats);
+                UpdateRxPktTimeStamp8190(priv, &stats);
 
                 //
                 // Get Total offset of MPDU Frame Body
@@ -5480,10 +4472,8 @@ static void rtl8192_rx(struct net_device *dev)
                 if((stats.RxBufShift + stats.RxDrvInfoSize) > 0)
                     stats.bShift = 1;
 
-                stats.RxIs40MHzPacket = pDrvInfo->BW;
-
                 /* ???? */
-                TranslateRxSignalStuff819xpci(dev,skb, &stats, pdesc, pDrvInfo);
+                TranslateRxSignalStuff819xpci(priv, skb, &stats, pdesc, pDrvInfo);
 
                 /* Rx A-MPDU */
                 if(pDrvInfo->FirstAGGR==1 || pDrvInfo->PartAggr == 1)
@@ -5503,11 +4493,6 @@ static void rtl8192_rx(struct net_device *dev)
                     unicast_packet = true;
                 }
 
-                stats.packetlength = stats.Length-4;
-                stats.fraglength = stats.packetlength;
-                stats.fragoffset = 0;
-                stats.ntotalfrag = 1;
-
                 if(!ieee80211_rtl_rx(priv->ieee80211, skb, &stats)){
                     dev_kfree_skb_any(skb);
                 } else {
@@ -5523,9 +4508,7 @@ static void rtl8192_rx(struct net_device *dev)
                 skb = new_skb;
                 priv->rx_buf[priv->rx_idx] = skb;
                 *((dma_addr_t *) skb->cb) = pci_map_single(priv->pdev, skb_tail_pointer(skb), priv->rxbuffersize, PCI_DMA_FROMDEVICE);
-            }
 
-        }
 done:
         pdesc->BufferAddress = cpu_to_le32(*((dma_addr_t *)skb->cb));
         pdesc->OWN = 1;
@@ -5537,11 +4520,12 @@ done:
 
 }
 
-static void rtl8192_irq_rx_tasklet(struct r8192_priv *priv)
+static void rtl8192_irq_rx_tasklet(unsigned long arg)
 {
-       rtl8192_rx(priv->ieee80211->dev);
+       struct r8192_priv *priv = (struct r8192_priv*) arg;
+       rtl8192_rx(priv);
        /* unmask RDU */
-       write_nic_dword(priv->ieee80211->dev, INTA_MASK,read_nic_dword(priv->ieee80211->dev, INTA_MASK) | IMR_RDU);
+       write_nic_dword(priv, INTA_MASK, read_nic_dword(priv, INTA_MASK) | IMR_RDU);
 }
 
 static const struct net_device_ops rtl8192_netdev_ops = {
@@ -5557,19 +4541,13 @@ static const struct net_device_ops rtl8192_netdev_ops = {
 static int __devinit rtl8192_pci_probe(struct pci_dev *pdev,
                         const struct pci_device_id *id)
 {
-       unsigned long ioaddr = 0;
        struct net_device *dev = NULL;
        struct r8192_priv *priv= NULL;
        u8 unit = 0;
        int ret = -ENODEV;
-
-#ifdef CONFIG_RTL8192_IO_MAP
-       unsigned long pio_start, pio_len, pio_flags;
-#else
        unsigned long pmem_start, pmem_len, pmem_flags;
-#endif //end #ifdef RTL_IO_MAP
 
-       RT_TRACE(COMP_INIT,"Configuring chip resources");
+       RT_TRACE(COMP_INIT,"Configuring chip resources\n");
 
        if( pci_enable_device (pdev) ){
                RT_TRACE(COMP_ERR,"Failed to enable PCI device");
@@ -5598,55 +4576,30 @@ static int __devinit rtl8192_pci_probe(struct pci_dev *pdev,
                priv->ieee80211->bSupportRemoteWakeUp = 0;
        }
 
-#ifdef CONFIG_RTL8192_IO_MAP
-
-       pio_start = (unsigned long)pci_resource_start (pdev, 0);
-       pio_len = (unsigned long)pci_resource_len (pdev, 0);
-       pio_flags = (unsigned long)pci_resource_flags (pdev, 0);
-
-       if (!(pio_flags & IORESOURCE_IO)) {
-               RT_TRACE(COMP_ERR,"region #0 not a PIO resource, aborting");
-               goto fail;
-       }
-
-       //DMESG("IO space @ 0x%08lx", pio_start );
-       if( ! request_region( pio_start, pio_len, RTL819xE_MODULE_NAME ) ){
-               RT_TRACE(COMP_ERR,"request_region failed!");
-               goto fail;
-       }
-
-       ioaddr = pio_start;
-       dev->base_addr = ioaddr; // device I/O address
-
-#else
-
        pmem_start = pci_resource_start(pdev, 1);
        pmem_len = pci_resource_len(pdev, 1);
        pmem_flags = pci_resource_flags (pdev, 1);
 
        if (!(pmem_flags & IORESOURCE_MEM)) {
-               RT_TRACE(COMP_ERR,"region #1 not a MMIO resource, aborting");
+               RT_TRACE(COMP_ERR, "region #1 not a MMIO resource, aborting\n");
                goto fail;
        }
 
        //DMESG("Memory mapped space @ 0x%08lx ", pmem_start);
        if( ! request_mem_region(pmem_start, pmem_len, RTL819xE_MODULE_NAME)) {
-               RT_TRACE(COMP_ERR,"request_mem_region failed!");
+               RT_TRACE(COMP_ERR,"request_mem_region failed!\n");
                goto fail;
        }
 
-
-       ioaddr = (unsigned long)ioremap_nocache( pmem_start, pmem_len);
-       if( ioaddr == (unsigned long)NULL ){
-               RT_TRACE(COMP_ERR,"ioremap failed!");
-              // release_mem_region( pmem_start, pmem_len );
+       priv->mem_start = ioremap_nocache(pmem_start, pmem_len);
+       if (!priv->mem_start) {
+               RT_TRACE(COMP_ERR,"ioremap failed!\n");
                goto fail1;
        }
 
-       dev->mem_start = ioaddr; // shared mem start
-       dev->mem_end = ioaddr + pci_resource_len(pdev, 0); // shared mem end
-
-#endif //end #ifdef RTL_IO_MAP
+       dev->mem_start = (unsigned long) priv->mem_start;
+       dev->mem_end = (unsigned long) (priv->mem_start +
+                                       pci_resource_len(pdev, 0));
 
         /* We disable the RETRY_TIMEOUT register (0x41) to keep
          * PCI Tx retries from interfering with C3 CPU state */
@@ -5673,17 +4626,14 @@ static int __devinit 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 (rtl8192_init(priv)!=0) {
+               RT_TRACE(COMP_ERR, "Initialization failed\n");
                goto fail;
        }
 
-       netif_carrier_off(dev);
-       netif_stop_queue(dev);
-
        register_netdev(dev);
        RT_TRACE(COMP_INIT, "dev name=======> %s\n",dev->name);
-       rtl8192_proc_init_one(dev);
+       rtl8192_proc_init_one(priv);
 
 
        RT_TRACE(COMP_INIT, "Driver probe completed\n");
@@ -5691,20 +4641,11 @@ static int __devinit rtl8192_pci_probe(struct pci_dev *pdev,
 
 fail1:
 
-#ifdef CONFIG_RTL8180_IO_MAP
-
-       if( dev->base_addr != 0 ){
-
-               release_region(dev->base_addr,
-              pci_resource_len(pdev, 0) );
-       }
-#else
-       if( dev->mem_start != (unsigned long)NULL ){
-               iounmap( (void *)dev->mem_start );
+       if (priv->mem_start) {
+               iounmap(priv->mem_start);
                release_mem_region( pci_resource_start(pdev, 1),
                                    pci_resource_len(pdev, 1) );
        }
-#endif //end #ifdef RTL_IO_MAP
 
 fail:
        if(dev){
@@ -5738,15 +4679,9 @@ static void rtl8192_cancel_deferred_work(struct r8192_priv* priv)
        cancel_delayed_work(&priv->watch_dog_wq);
        cancel_delayed_work(&priv->update_beacon_wq);
        cancel_delayed_work(&priv->ieee80211->hw_wakeup_wq);
-       cancel_delayed_work(&priv->ieee80211->hw_sleep_wq);
-#ifdef RTL8192E
        cancel_delayed_work(&priv->gpio_change_rf_wq);
-#endif
        cancel_work_sync(&priv->reset_wq);
        cancel_work_sync(&priv->qos_activate);
-       //cancel_work_sync(&priv->SetBWModeWorkItem);
-       //cancel_work_sync(&priv->SwChnlWorkItem);
-
 }
 
 
@@ -5754,14 +4689,15 @@ static void __devexit rtl8192_pci_disconnect(struct pci_dev *pdev)
 {
        struct net_device *dev = pci_get_drvdata(pdev);
        struct r8192_priv *priv ;
+       u32 i;
 
-       if(dev){
+       if (dev) {
 
                unregister_netdev(dev);
 
-               priv=ieee80211_priv(dev);
+               priv = ieee80211_priv(dev);
 
-               rtl8192_proc_remove_one(dev);
+               rtl8192_proc_remove_one(priv);
 
                rtl8192_down(dev);
                if (priv->pFirmware)
@@ -5769,45 +4705,26 @@ static void __devexit rtl8192_pci_disconnect(struct pci_dev *pdev)
                        vfree(priv->pFirmware);
                        priv->pFirmware = NULL;
                }
-       //      priv->rf_close(dev);
-       //      rtl8192_usb_deleteendpoints(dev);
                destroy_workqueue(priv->priv_wq);
-                /* redundant with rtl8192_down */
-               // rtl8192_irq_disable(dev);
-               // rtl8192_reset(dev);
-               // mdelay(10);
-                {
-                    u32 i;
-                    /* free tx/rx rings */
-                    rtl8192_free_rx_ring(dev);
-                    for (i = 0; i < MAX_TX_QUEUE_COUNT; i++) {
-                        rtl8192_free_tx_ring(dev, i);
-                    }
-                }
-               if(priv->irq){
 
+               /* free tx/rx rings */
+               rtl8192_free_rx_ring(priv);
+               for (i = 0; i < MAX_TX_QUEUE_COUNT; i++)
+                       rtl8192_free_tx_ring(priv, i);
+
+               if (priv->irq) {
                        printk("Freeing irq %d\n",dev->irq);
                        free_irq(dev->irq, dev);
                        priv->irq=0;
-
                }
 
-#ifdef CONFIG_RTL8180_IO_MAP
-
-               if( dev->base_addr != 0 ){
-
-                       release_region(dev->base_addr,
-                                      pci_resource_len(pdev, 0) );
-               }
-#else
-               if( dev->mem_start != (unsigned long)NULL ){
-                       iounmap( (void *)dev->mem_start );
+               if (priv->mem_start) {
+                       iounmap(priv->mem_start);
                        release_mem_region( pci_resource_start(pdev, 1),
                                            pci_resource_len(pdev, 1) );
                }
-#endif /*end #ifdef RTL_IO_MAP*/
-               free_ieee80211(dev);
 
+               free_ieee80211(dev);
        }
 
        pci_disable_device(pdev);
@@ -5827,7 +4744,7 @@ static int __init rtl8192_pci_module_init(void)
 
        printk(KERN_INFO "\nLinux kernel driver for RTL8192 based WLAN cards\n");
        printk(KERN_INFO "Copyright (c) 2007-2008, Realsil Wlan\n");
-       RT_TRACE(COMP_INIT, "Initializing module");
+       RT_TRACE(COMP_INIT, "Initializing module\n");
        rtl8192_proc_module_init();
       if(0!=pci_register_driver(&rtl8192_pci_driver))
        {
@@ -5843,7 +4760,7 @@ static void __exit rtl8192_pci_module_exit(void)
 {
        pci_unregister_driver(&rtl8192_pci_driver);
 
-       RT_TRACE(COMP_DOWN, "Exiting");
+       RT_TRACE(COMP_DOWN, "Exiting\n");
        rtl8192_proc_module_remove();
        ieee80211_rtl_exit();
 }
@@ -5858,14 +4775,10 @@ static irqreturn_t rtl8192_interrupt(int irq, void *netdev)
 
        spin_lock_irqsave(&priv->irq_th_lock, flags);
 
-       /* We should return IRQ_NONE, but for now let me keep this */
-       if (priv->irq_enabled == 0)
-               goto out_unlock;
-
        /* ISR: 4bytes */
 
-       inta = read_nic_dword(dev, ISR); /* & priv->IntrMask; */
-       write_nic_dword(dev, ISR, inta); /* reset int situation */
+       inta = read_nic_dword(priv, ISR); /* & priv->IntrMask; */
+       write_nic_dword(priv, ISR, inta); /* reset int situation */
 
        if (!inta) {
                /*
@@ -5885,26 +4798,26 @@ static irqreturn_t rtl8192_interrupt(int irq, void *netdev)
 
        if (inta & IMR_TBDOK) {
                RT_TRACE(COMP_INTR, "beacon ok interrupt!\n");
-               rtl8192_tx_isr(dev, BEACON_QUEUE);
+               rtl8192_tx_isr(priv, BEACON_QUEUE);
                priv->stats.txbeaconokint++;
        }
 
        if (inta & IMR_TBDER) {
                RT_TRACE(COMP_INTR, "beacon ok interrupt!\n");
-               rtl8192_tx_isr(dev, BEACON_QUEUE);
+               rtl8192_tx_isr(priv, BEACON_QUEUE);
                priv->stats.txbeaconerr++;
        }
 
        if (inta & IMR_MGNTDOK ) {
                RT_TRACE(COMP_INTR, "Manage ok interrupt!\n");
                priv->stats.txmanageokint++;
-               rtl8192_tx_isr(dev,MGNT_QUEUE);
+               rtl8192_tx_isr(priv, MGNT_QUEUE);
        }
 
        if (inta & IMR_COMDOK)
        {
                priv->stats.txcmdpktokint++;
-               rtl8192_tx_isr(dev, TXCMD_QUEUE);
+               rtl8192_tx_isr(priv, TXCMD_QUEUE);
        }
 
        if (inta & IMR_ROK) {
@@ -5921,7 +4834,7 @@ static irqreturn_t rtl8192_interrupt(int irq, void *netdev)
                RT_TRACE(COMP_INTR, "rx descriptor unavailable!\n");
                priv->stats.rxrdu++;
                /* reset int situation */
-               write_nic_dword(dev, INTA_MASK, read_nic_dword(dev, INTA_MASK) & ~IMR_RDU);
+               write_nic_dword(priv, INTA_MASK, read_nic_dword(priv, INTA_MASK) & ~IMR_RDU);
                tasklet_schedule(&priv->irq_rx_tasklet);
        }
 
@@ -5938,27 +4851,27 @@ static irqreturn_t rtl8192_interrupt(int irq, void *netdev)
                RT_TRACE(COMP_INTR, "BK Tx OK interrupt!\n");
                priv->stats.txbkokint++;
                priv->ieee80211->LinkDetectInfo.NumTxOkInPeriod++;
-               rtl8192_tx_isr(dev, BK_QUEUE);
+               rtl8192_tx_isr(priv, BK_QUEUE);
        }
 
        if (inta & IMR_BEDOK) {
                RT_TRACE(COMP_INTR, "BE TX OK interrupt!\n");
                priv->stats.txbeokint++;
                priv->ieee80211->LinkDetectInfo.NumTxOkInPeriod++;
-               rtl8192_tx_isr(dev, BE_QUEUE);
+               rtl8192_tx_isr(priv, BE_QUEUE);
        }
 
        if (inta & IMR_VIDOK) {
                RT_TRACE(COMP_INTR, "VI TX OK interrupt!\n");
                priv->stats.txviokint++;
                priv->ieee80211->LinkDetectInfo.NumTxOkInPeriod++;
-               rtl8192_tx_isr(dev, VI_QUEUE);
+               rtl8192_tx_isr(priv, VI_QUEUE);
        }
 
        if (inta & IMR_VODOK) {
                priv->stats.txvookint++;
                priv->ieee80211->LinkDetectInfo.NumTxOkInPeriod++;
-               rtl8192_tx_isr(dev, VO_QUEUE);
+               rtl8192_tx_isr(priv, VO_QUEUE);
        }
 
 out_unlock:
@@ -5967,14 +4880,13 @@ out_unlock:
        return ret;
 }
 
-void EnableHWSecurityConfig8192(struct net_device *dev)
+void EnableHWSecurityConfig8192(struct r8192_priv *priv)
 {
         u8 SECR_value = 0x0;
-       struct r8192_priv *priv = (struct r8192_priv *)ieee80211_priv(dev);
        struct ieee80211_device* ieee = priv->ieee80211;
 
        SECR_value = SCR_TxEncEnable | SCR_RxDecEnable;
-#if 1
+
        if (((KEY_TYPE_WEP40 == ieee->pairwise_key_type) || (KEY_TYPE_WEP104 == ieee->pairwise_key_type)) && (priv->ieee80211->auth_mode != 2))
        {
                SECR_value |= SCR_RxUseDK;
@@ -5986,8 +4898,6 @@ void EnableHWSecurityConfig8192(struct net_device *dev)
                SECR_value |= SCR_TxUseDK;
        }
 
-#endif
-
         //add HWSec active enable here.
 //default using hwsec. when peer AP is in N mode only and pairwise_key_type is none_aes(which HT_IOT_ACT_PURE_N_MODE indicates it), use software security. when peer AP is in b,g,n mode mixed and pairwise_key_type is none_aes, use g mode hw security. WB on 2008.7.4
        ieee->hwsec_active = 1;
@@ -6001,31 +4911,26 @@ void EnableHWSecurityConfig8192(struct net_device *dev)
        RT_TRACE(COMP_SEC,"%s:, hwsec:%d, pairwise_key:%d, SECR_value:%x\n", __FUNCTION__,
                        ieee->hwsec_active, ieee->pairwise_key_type, SECR_value);
        {
-                write_nic_byte(dev, SECR,  SECR_value);//SECR_value |  SCR_UseDK );
+                write_nic_byte(priv, SECR,  SECR_value);//SECR_value |  SCR_UseDK );
         }
 
 }
 #define TOTAL_CAM_ENTRY 32
 //#define CAM_CONTENT_COUNT 8
-void setKey(   struct net_device *dev,
-               u8 EntryNo,
-               u8 KeyIndex,
-               u16 KeyType,
-               const u8 *MacAddr,
-               u8 DefaultKey,
-               u32 *KeyContent )
+void setKey(struct r8192_priv *priv, u8 EntryNo, u8 KeyIndex, u16 KeyType,
+           const u8 *MacAddr, u8 DefaultKey, u32 *KeyContent)
 {
        u32 TargetCommand = 0;
        u32 TargetContent = 0;
        u16 usConfig = 0;
        u8 i;
 #ifdef ENABLE_IPS
-       struct r8192_priv *priv = (struct r8192_priv *)ieee80211_priv(dev);
        RT_RF_POWER_STATE       rtState;
-       rtState = priv->ieee80211->eRFPowerState;
-       if(priv->ieee80211->PowerSaveControl.bInactivePs){
+
+       rtState = priv->eRFPowerState;
+       if (priv->PowerSaveControl.bInactivePs){
                if(rtState == eRfOff){
-                       if(priv->ieee80211->RfOffReason > RF_CHANGE_BY_IPS)
+                       if(priv->RfOffReason > RF_CHANGE_BY_IPS)
                        {
                                RT_TRACE(COMP_ERR, "%s(): RF is OFF.\n",__FUNCTION__);
                                //up(&priv->wx_sem);
@@ -6033,7 +4938,7 @@ void setKey(      struct net_device *dev,
                        }
                        else{
                                down(&priv->ieee80211->ips_sem);
-                               IPSLeave(dev);
+                               IPSLeave(priv);
                                up(&priv->ieee80211->ips_sem);
                        }
                }
@@ -6043,7 +4948,7 @@ void setKey(      struct net_device *dev,
        if (EntryNo >= TOTAL_CAM_ENTRY)
                RT_TRACE(COMP_ERR, "cam entry exceeds in setKey()\n");
 
-       RT_TRACE(COMP_SEC, "====>to setKey(), dev:%p, EntryNo:%d, KeyIndex:%d, KeyType:%d, MacAddr%pM\n", dev,EntryNo, KeyIndex, KeyType, MacAddr);
+       RT_TRACE(COMP_SEC, "====>to setKey(), priv:%p, EntryNo:%d, KeyIndex:%d, KeyType:%d, MacAddr%pM\n", priv, EntryNo, KeyIndex, KeyType, MacAddr);
 
        if (DefaultKey)
                usConfig |= BIT15 | (KeyType<<2);
@@ -6061,33 +4966,32 @@ void setKey(    struct net_device *dev,
                                        (u32)(*(MacAddr+1)) << 24|
                                        (u32)usConfig;
 
-                       write_nic_dword(dev, WCAMI, TargetContent);
-                       write_nic_dword(dev, RWCAM, TargetCommand);
+                       write_nic_dword(priv, WCAMI, TargetContent);
+                       write_nic_dword(priv, RWCAM, TargetCommand);
                }
                else if(i==1){//MAC
                         TargetContent = (u32)(*(MacAddr+2))     |
                                         (u32)(*(MacAddr+3)) <<  8|
                                         (u32)(*(MacAddr+4)) << 16|
                                         (u32)(*(MacAddr+5)) << 24;
-                       write_nic_dword(dev, WCAMI, TargetContent);
-                       write_nic_dword(dev, RWCAM, TargetCommand);
+                       write_nic_dword(priv, WCAMI, TargetContent);
+                       write_nic_dword(priv, RWCAM, TargetCommand);
                }
                else {  //Key Material
                        if(KeyContent != NULL)
                        {
-                       write_nic_dword(dev, WCAMI, (u32)(*(KeyContent+i-2)) );
-                       write_nic_dword(dev, RWCAM, TargetCommand);
+                       write_nic_dword(priv, WCAMI, (u32)(*(KeyContent+i-2)) );
+                       write_nic_dword(priv, RWCAM, TargetCommand);
                }
        }
        }
        RT_TRACE(COMP_SEC,"=========>after set key, usconfig:%x\n", usConfig);
 }
 
-bool NicIFEnableNIC(struct net_device* dev)
+bool NicIFEnableNIC(struct r8192_priv *priv)
 {
        RT_STATUS init_status = RT_STATUS_SUCCESS;
-       struct r8192_priv* priv = ieee80211_priv(dev);
-       PRT_POWER_SAVE_CONTROL pPSC = (PRT_POWER_SAVE_CONTROL)(&(priv->ieee80211->PowerSaveControl));
+       PRT_POWER_SAVE_CONTROL pPSC = &priv->PowerSaveControl;
 
        //YJ,add,091109
        if (priv->up == 0){
@@ -6100,7 +5004,7 @@ bool NicIFEnableNIC(struct net_device* dev)
 
        // <2> Enable Adapter
        //priv->bfirst_init = true;
-       init_status = rtl8192_adapter_start(dev);
+       init_status = rtl8192_adapter_start(priv);
        if (init_status != RT_STATUS_SUCCESS) {
                RT_TRACE(COMP_ERR,"ERR!!! %s(): initialization is failed!\n",__FUNCTION__);
                priv->bdisable_nic = false;  //YJ,add,091111
@@ -6110,16 +5014,15 @@ bool NicIFEnableNIC(struct net_device* dev)
        //priv->bfirst_init = false;
 
        // <3> Enable Interrupt
-       rtl8192_irq_enable(dev);
+       rtl8192_irq_enable(priv);
        priv->bdisable_nic = false;
 
        return (init_status == RT_STATUS_SUCCESS);
 }
 
-bool NicIFDisableNIC(struct net_device* dev)
+bool NicIFDisableNIC(struct r8192_priv *priv)
 {
        bool    status = true;
-       struct r8192_priv* priv = ieee80211_priv(dev);
        u8 tmp_state = 0;
        // <1> Disable Interrupt
 
@@ -6130,11 +5033,11 @@ bool NicIFDisableNIC(struct net_device* dev)
 
        priv->ieee80211->state = tmp_state;
        rtl8192_cancel_deferred_work(priv);
-       rtl8192_irq_disable(dev);
+       rtl8192_irq_disable(priv);
        // <2> Stop all timer
 
        // <3> Disable Adapter
-       rtl8192_halt_adapter(dev, false);
+       rtl8192_halt_adapter(priv, false);
 //     priv->bdisable_nic = true;
 
        return status;