]> git.karo-electronics.de Git - karo-tx-linux.git/blobdiff - drivers/staging/rtl8192u/r8192U_core.c
Merge branch 'x86-ras-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...
[karo-tx-linux.git] / drivers / staging / rtl8192u / r8192U_core.c
index f790292acf3364384957a7fe9d7a3e1f6f540376..c880adcaf0fdf722c01a68a8763796841a6b545e 100644 (file)
  */
 
 #ifndef CONFIG_FORCE_HARD_FLOAT
-double __floatsidf(int i) { return i; }
-unsigned int __fixunsdfsi(double d) { return d; }
-double __adddf3(double a, double b) { return a+b; }
-double __addsf3(float a, float b) { return a+b; }
-double __subdf3(double a, double b) { return a-b; }
-double __extendsfdf2(float a) {return a; }
+double __floatsidf(int i)
+{
+       return i;
+}
+
+unsigned int __fixunsdfsi(double d)
+{
+       return d;
+}
+
+double __adddf3(double a, double b)
+{
+       return a+b;
+}
+
+double __addsf3(float a, float b)
+{
+       return a+b;
+}
+
+double __subdf3(double a, double b)
+{
+       return a-b;
+}
+
+double __extendsfdf2(float a)
+{
+       return a;
+}
 #endif
 
 #undef LOOP_TEST
@@ -68,7 +91,6 @@ double __extendsfdf2(float a) {return a; }
 #include "r819xU_phyreg.h"
 #include "r819xU_cmdpkt.h"
 #include "r8192U_dm.h"
-//#include "r8192xU_phyreg.h"
 #include <linux/usb.h>
 #include <linux/slab.h>
 #include <linux/proc_fs.h>
@@ -81,25 +103,8 @@ double __extendsfdf2(float a) {return a; }
 
 #include "dot11d.h"
 //set here to open your trace code. //WB
-u32 rt_global_debug_component = \
-                       //      COMP_INIT       |
-//                             COMP_DBG        |
-                       //      COMP_EPROM      |
-//                             COMP_PHY        |
-                       //      COMP_RF         |
-//                             COMP_FIRMWARE   |
-//                             COMP_CH         |
-                       //      COMP_POWER_TRACKING |
-//                             COMP_RATE       |
-                       //      COMP_TXAGC      |
-               //              COMP_TRACE      |
-                               COMP_DOWN       |
-               //              COMP_RECV       |
-               //              COMP_SWBW       |
+u32 rt_global_debug_component = COMP_DOWN      |
                                COMP_SEC        |
-       //                      COMP_RESET      |
-               //              COMP_SEND       |
-                       //      COMP_EVENTS     |
                                COMP_ERR; //always open err flags on
 
 #define TOTAL_CAM_ENTRY 32
@@ -137,17 +142,15 @@ static int channels = 0x3fff;
 
 
 module_param(ifname, charp, S_IRUGO|S_IWUSR);
-//module_param(hwseqnum,int, S_IRUGO|S_IWUSR);
 module_param(hwwep, int, S_IRUGO|S_IWUSR);
 module_param(channels, int, S_IRUGO|S_IWUSR);
 
 MODULE_PARM_DESC(ifname, " Net interface name, wlan%d=default");
-//MODULE_PARM_DESC(hwseqnum," Try to use hardware 802.11 header sequence numbers. Zero=default");
 MODULE_PARM_DESC(hwwep, " Try to use hardware security support. ");
 MODULE_PARM_DESC(channels, " Channel bitmask for specific locales. NYI");
 
 static int rtl8192_usb_probe(struct usb_interface *intf,
-                        const struct usb_device_id *id);
+                            const struct usb_device_id *id);
 static void rtl8192_usb_disconnect(struct usb_interface *intf);
 
 
@@ -189,8 +192,7 @@ static void rtl819x_set_channel_map(u8 channel_plan, struct r8192_priv *priv)
 {
        int i, max_chan = -1, min_chan = -1;
        struct ieee80211_device *ieee = priv->ieee80211;
-       switch (channel_plan)
-       {
+       switch (channel_plan) {
        case COUNTRY_CODE_FCC:
        case COUNTRY_CODE_IC:
        case COUNTRY_CODE_ETSI:
@@ -200,15 +202,14 @@ static void rtl819x_set_channel_map(u8 channel_plan, struct r8192_priv *priv)
        case COUNTRY_CODE_MKK1:
        case COUNTRY_CODE_ISRAEL:
        case COUNTRY_CODE_TELEC:
-       case COUNTRY_CODE_MIC:  
+       case COUNTRY_CODE_MIC:
                Dot11d_Init(ieee);
                ieee->bGlobalDomain = false;
                //actually 8225 & 8256 rf chips only support B,G,24N mode
                if ((priv->rf_chip == RF_8225) || (priv->rf_chip == RF_8256)) {
                        min_chan = 1;
                        max_chan = 14;
-               }
-               else {
+               } else {
                        RT_TRACE(COMP_ERR, "unknown rf chip, can't set channel map in function:%s()\n", __func__);
                }
                if (ChannelPlan[channel_plan].Len != 0) {
@@ -228,19 +229,13 @@ static void rtl819x_set_channel_map(u8 channel_plan, struct r8192_priv *priv)
                Dot11d_Reset(ieee);
                ieee->bGlobalDomain = true;
                break;
-       
+
        default:
                break;
        }
 }
 
 
-#define                rx_hal_is_cck_rate(_pdrvinfo)\
-                       (_pdrvinfo->RxRate == DESC90_RATE1M ||\
-                       _pdrvinfo->RxRate == DESC90_RATE2M ||\
-                       _pdrvinfo->RxRate == DESC90_RATE5_5M ||\
-                       _pdrvinfo->RxRate == DESC90_RATE11M) &&\
-                       !_pdrvinfo->RxHT\
 
 
 void CamResetAllEntry(struct net_device *dev)
@@ -249,12 +244,6 @@ void CamResetAllEntry(struct net_device *dev)
        //2004/02/11  In static WEP, OID_ADD_KEY or OID_ADD_WEP are set before STA associate to AP.
        // However, ResetKey is called on OID_802_11_INFRASTRUCTURE_MODE and MlmeAssociateRequest
        // In this condition, Cam can not be reset because upper layer will not set this static key again.
-       //if(Adapter->EncAlgorithm == WEP_Encryption)
-       //      return;
-//debug
-       //DbgPrint("========================================\n");
-       //DbgPrint("                            Call ResetAllEntry                                              \n");
-       //DbgPrint("========================================\n\n");
        ulcommand |= BIT31|BIT30;
        write_nic_dword(dev, RWCAM, ulcommand);
 
@@ -269,8 +258,11 @@ void write_cam(struct net_device *dev, u8 addr, u32 data)
 
 u32 read_cam(struct net_device *dev, u8 addr)
 {
+       u32 data;
+
        write_nic_dword(dev, RWCAM, 0x80000000|(addr&0xff));
-       return read_nic_dword(dev, 0xa8);
+       read_nic_dword(dev, 0xa8, &data);
+       return data;
 }
 
 void write_nic_byte_E(struct net_device *dev, int indx, u8 data)
@@ -280,32 +272,29 @@ void write_nic_byte_E(struct net_device *dev, int indx, u8 data)
        struct usb_device *udev = priv->udev;
 
        status = usb_control_msg(udev, usb_sndctrlpipe(udev, 0),
-                              RTL8187_REQ_SET_REGS, RTL8187_REQT_WRITE,
-                              indx|0xfe00, 0, &data, 1, HZ / 2);
+                                RTL8187_REQ_SET_REGS, RTL8187_REQT_WRITE,
+                                indx|0xfe00, 0, &data, 1, HZ / 2);
 
        if (status < 0)
-       {
-               printk("write_nic_byte_E TimeOut! status:%d\n", status);
-       }
+               netdev_err(dev, "write_nic_byte_E TimeOut! status: %d\n", status);
 }
 
-u8 read_nic_byte_E(struct net_device *dev, int indx)
+int read_nic_byte_E(struct net_device *dev, int indx, u8 *data)
 {
        int status;
-       u8 data;
        struct r8192_priv *priv = (struct r8192_priv *)ieee80211_priv(dev);
        struct usb_device *udev = priv->udev;
 
        status = usb_control_msg(udev, usb_rcvctrlpipe(udev, 0),
-                              RTL8187_REQ_GET_REGS, RTL8187_REQT_READ,
-                              indx|0xfe00, 0, &data, 1, HZ / 2);
+                                RTL8187_REQ_GET_REGS, RTL8187_REQT_READ,
+                                indx|0xfe00, 0, data, 1, HZ / 2);
 
-       if (status < 0)
-       {
-               printk("read_nic_byte_E TimeOut! status:%d\n", status);
+       if (status < 0) {
+               netdev_err(dev, "%s failure status: %d\n", __func__, status);
+               return status;
        }
 
-       return data;
+       return 0;
 }
 //as 92U has extend page from 4 to 16, so modify functions below.
 void write_nic_byte(struct net_device *dev, int indx, u8 data)
@@ -316,13 +305,11 @@ void write_nic_byte(struct net_device *dev, int indx, u8 data)
        struct usb_device *udev = priv->udev;
 
        status = usb_control_msg(udev, usb_sndctrlpipe(udev, 0),
-                              RTL8187_REQ_SET_REGS, RTL8187_REQT_WRITE,
-                              (indx&0xff)|0xff00, (indx>>8)&0x0f, &data, 1, HZ / 2);
+                                RTL8187_REQ_SET_REGS, RTL8187_REQT_WRITE,
+                                (indx&0xff)|0xff00, (indx>>8)&0x0f, &data, 1, HZ / 2);
 
        if (status < 0)
-       {
-               printk("write_nic_byte TimeOut! status:%d\n", status);
-       }
+               netdev_err(dev, "write_nic_byte TimeOut! status: %d\n", status);
 
 
 }
@@ -337,13 +324,11 @@ void write_nic_word(struct net_device *dev, int indx, u16 data)
        struct usb_device *udev = priv->udev;
 
        status = usb_control_msg(udev, usb_sndctrlpipe(udev, 0),
-                              RTL8187_REQ_SET_REGS, RTL8187_REQT_WRITE,
-                              (indx&0xff)|0xff00, (indx>>8)&0x0f, &data, 2, HZ / 2);
+                                RTL8187_REQ_SET_REGS, RTL8187_REQT_WRITE,
+                                (indx&0xff)|0xff00, (indx>>8)&0x0f, &data, 2, HZ / 2);
 
        if (status < 0)
-       {
-               printk("write_nic_word TimeOut! status:%d\n", status);
-       }
+               netdev_err(dev, "write_nic_word TimeOut! status: %d\n", status);
 
 }
 
@@ -357,98 +342,92 @@ void write_nic_dword(struct net_device *dev, int indx, u32 data)
        struct usb_device *udev = priv->udev;
 
        status = usb_control_msg(udev, usb_sndctrlpipe(udev, 0),
-                              RTL8187_REQ_SET_REGS, RTL8187_REQT_WRITE,
-                              (indx&0xff)|0xff00, (indx>>8)&0x0f, &data, 4, HZ / 2);
+                                RTL8187_REQ_SET_REGS, RTL8187_REQT_WRITE,
+                                (indx&0xff)|0xff00, (indx>>8)&0x0f, &data, 4, HZ / 2);
 
 
        if (status < 0)
-       {
-               printk("write_nic_dword TimeOut! status:%d\n", status);
-       }
+               netdev_err(dev, "write_nic_dword TimeOut! status: %d\n", status);
 
 }
 
 
 
-u8 read_nic_byte(struct net_device *dev, int indx)
+int read_nic_byte(struct net_device *dev, int indx, u8 *data)
 {
-       u8 data;
        int status;
        struct r8192_priv *priv = (struct r8192_priv *)ieee80211_priv(dev);
        struct usb_device *udev = priv->udev;
 
        status = usb_control_msg(udev, usb_rcvctrlpipe(udev, 0),
-                              RTL8187_REQ_GET_REGS, RTL8187_REQT_READ,
-                              (indx&0xff)|0xff00, (indx>>8)&0x0f, &data, 1, HZ / 2);
+                                RTL8187_REQ_GET_REGS, RTL8187_REQT_READ,
+                                (indx&0xff)|0xff00, (indx>>8)&0x0f, data, 1, HZ / 2);
 
-       if (status < 0)
-       {
-               printk("read_nic_byte TimeOut! status:%d\n", status);
+       if (status < 0) {
+               netdev_err(dev, "%s failure status: %d\n", __func__, status);
+               return status;
        }
 
-       return data;
+       return 0;
 }
 
 
 
-u16 read_nic_word(struct net_device *dev, int indx)
+int read_nic_word(struct net_device *dev, int indx, u16 *data)
 {
-       u16 data;
        int status;
        struct r8192_priv *priv = (struct r8192_priv *)ieee80211_priv(dev);
        struct usb_device *udev = priv->udev;
 
        status = usb_control_msg(udev, usb_rcvctrlpipe(udev, 0),
-                                      RTL8187_REQ_GET_REGS, RTL8187_REQT_READ,
-                                      (indx&0xff)|0xff00, (indx>>8)&0x0f,
-                                                       &data, 2, HZ / 2);
+                                RTL8187_REQ_GET_REGS, RTL8187_REQT_READ,
+                                (indx&0xff)|0xff00, (indx>>8)&0x0f,
+                                data, 2, HZ / 2);
 
-       if (status < 0)
-               printk("read_nic_word TimeOut! status:%d\n", status);
+       if (status < 0) {
+               netdev_err(dev, "%s failure status: %d\n", __func__, status);
+               return status;
+       }
 
-       return data;
+       return 0;
 }
 
-u16 read_nic_word_E(struct net_device *dev, int indx)
+int read_nic_word_E(struct net_device *dev, int indx, u16 *data)
 {
-       u16 data;
        int status;
        struct r8192_priv *priv = (struct r8192_priv *)ieee80211_priv(dev);
        struct usb_device *udev = priv->udev;
 
        status = usb_control_msg(udev, usb_rcvctrlpipe(udev, 0),
-                              RTL8187_REQ_GET_REGS, RTL8187_REQT_READ,
-                                      indx|0xfe00, 0, &data, 2, HZ / 2);
+                                RTL8187_REQ_GET_REGS, RTL8187_REQT_READ,
+                                indx|0xfe00, 0, data, 2, HZ / 2);
 
-       if (status < 0)
-               printk("read_nic_word TimeOut! status:%d\n", status);
+       if (status < 0) {
+               netdev_err(dev, "%s failure status: %d\n", __func__, status);
+               return status;
+       }
 
-       return data;
+       return 0;
 }
 
-u32 read_nic_dword(struct net_device *dev, int indx)
+int read_nic_dword(struct net_device *dev, int indx, u32 *data)
 {
-       u32 data;
        int status;
-       /* int result; */
 
        struct r8192_priv *priv = (struct r8192_priv *)ieee80211_priv(dev);
        struct usb_device *udev = priv->udev;
 
        status = usb_control_msg(udev, usb_rcvctrlpipe(udev, 0),
-                                      RTL8187_REQ_GET_REGS, RTL8187_REQT_READ,
-                                       (indx&0xff)|0xff00, (indx>>8)&0x0f,
-                                                       &data, 4, HZ / 2);
-       /* if(0 != result) {
-        *      printk(KERN_WARNING "read size of data = %d\, date = %d\n",
-        *                                                       result, data);
-        * }
-        */
+                                RTL8187_REQ_GET_REGS, RTL8187_REQT_READ,
+                                (indx&0xff)|0xff00, (indx>>8)&0x0f,
+                                data, 4, HZ / 2);
 
-       if (status < 0)
-               printk("read_nic_dword TimeOut! status:%d\n", status);
+       if (status < 0) {
+               netdev_err(dev, "%s failure status: %d\n", __func__, status);
+               return status;
+       }
 
-       return data;
+       return 0;
 }
 
 /* u8 read_phy_cck(struct net_device *dev, u8 adr); */
@@ -462,9 +441,7 @@ inline void force_pci_posting(struct net_device *dev)
 
 static struct net_device_stats *rtl8192_stats(struct net_device *dev);
 void rtl8192_commit(struct net_device *dev);
-/* void rtl8192_restart(struct net_device *dev); */
 void rtl8192_restart(struct work_struct *work);
-/* void rtl8192_rq_tx_ack(struct work_struct *work); */
 void watch_dog_timer_callback(unsigned long data);
 
 /****************************************************************************
@@ -496,39 +473,37 @@ static int proc_get_registers(struct seq_file *m, void *v)
 {
        struct net_device *dev = m->private;
        int i, n, max = 0xff;
+       u8 byte_rd;
 
        seq_puts(m, "\n####################page 0##################\n ");
 
        for (n = 0; n <= max;) {
-               //printk( "\nD: %2x> ", n);
                seq_printf(m, "\nD:  %2x > ", n);
 
-               for (i = 0; i < 16 && n <= max; i++, n++)
-                       seq_printf(m, "%2x ", read_nic_byte(dev, 0x000|n));
-
-               //      printk("%2x ",read_nic_byte(dev,n));
+               for (i = 0; i < 16 && n <= max; i++, n++) {
+                       read_nic_byte(dev, 0x000|n, &byte_rd);
+                       seq_printf(m, "%2x ", byte_rd);
+               }
        }
 
        seq_puts(m, "\n####################page 1##################\n ");
        for (n = 0; n <= max;) {
-               //printk( "\nD: %2x> ", n);
                seq_printf(m, "\nD:  %2x > ", n);
 
-               for (i = 0; i < 16 && n <= max; i++, n++)
-                       seq_printf(m, "%2x ", read_nic_byte(dev, 0x100|n));
-
-               //      printk("%2x ",read_nic_byte(dev,n));
+               for (i = 0; i < 16 && n <= max; i++, n++) {
+                       read_nic_byte(dev, 0x100|n, &byte_rd);
+                       seq_printf(m, "%2x ", byte_rd);
+               }
        }
 
        seq_puts(m, "\n####################page 3##################\n ");
        for (n = 0; n <= max;) {
-               //printk( "\nD: %2x> ", n);
                seq_printf(m, "\nD:  %2x > ", n);
 
-               for (i = 0; i < 16 && n <= max; i++, n++)
-                       seq_printf(m, "%2x ", read_nic_byte(dev, 0x300|n));
-
-               //      printk("%2x ",read_nic_byte(dev,n));
+               for (i = 0; i < 16 && n <= max; i++, n++) {
+                       read_nic_byte(dev, 0x300|n, &byte_rd);
+                       seq_printf(m, "%2x ", byte_rd);
+               }
        }
 
        seq_putc(m, '\n');
@@ -541,64 +516,54 @@ static int proc_get_stats_tx(struct seq_file *m, void *v)
        struct r8192_priv *priv = (struct r8192_priv *)ieee80211_priv(dev);
 
        seq_printf(m,
-               "TX VI priority ok int: %lu\n"
-               "TX VI priority error int: %lu\n"
-               "TX VO priority ok int: %lu\n"
-               "TX VO priority error int: %lu\n"
-               "TX BE priority ok int: %lu\n"
-               "TX BE priority error int: %lu\n"
-               "TX BK priority ok int: %lu\n"
-               "TX BK priority error int: %lu\n"
-               "TX MANAGE priority ok int: %lu\n"
-               "TX MANAGE priority error int: %lu\n"
-               "TX BEACON priority ok int: %lu\n"
-               "TX BEACON priority error int: %lu\n"
-//             "TX high priority ok int: %lu\n"
-//             "TX high priority failed error int: %lu\n"
-               "TX queue resume: %lu\n"
-               "TX queue stopped?: %d\n"
-               "TX fifo overflow: %lu\n"
-//             "TX beacon: %lu\n"
-               "TX VI queue: %d\n"
-               "TX VO queue: %d\n"
-               "TX BE queue: %d\n"
-               "TX BK queue: %d\n"
-//             "TX HW queue: %d\n"
-               "TX VI dropped: %lu\n"
-               "TX VO dropped: %lu\n"
-               "TX BE dropped: %lu\n"
-               "TX BK dropped: %lu\n"
-               "TX total data packets %lu\n",
-//             "TX beacon aborted: %lu\n",
-               priv->stats.txviokint,
-               priv->stats.txvierr,
-               priv->stats.txvookint,
-               priv->stats.txvoerr,
-               priv->stats.txbeokint,
-               priv->stats.txbeerr,
-               priv->stats.txbkokint,
-               priv->stats.txbkerr,
-               priv->stats.txmanageokint,
-               priv->stats.txmanageerr,
-               priv->stats.txbeaconokint,
-               priv->stats.txbeaconerr,
-//             priv->stats.txhpokint,
-//             priv->stats.txhperr,
-               priv->stats.txresumed,
-               netif_queue_stopped(dev),
-               priv->stats.txoverflow,
-//             priv->stats.txbeacon,
-               atomic_read(&(priv->tx_pending[VI_PRIORITY])),
-               atomic_read(&(priv->tx_pending[VO_PRIORITY])),
-               atomic_read(&(priv->tx_pending[BE_PRIORITY])),
-               atomic_read(&(priv->tx_pending[BK_PRIORITY])),
-//             read_nic_byte(dev, TXFIFOCOUNT),
-               priv->stats.txvidrop,
-               priv->stats.txvodrop,
-               priv->stats.txbedrop,
-               priv->stats.txbkdrop,
-               priv->stats.txdatapkt
-//             priv->stats.txbeaconerr
+                  "TX VI priority ok int: %lu\n"
+                  "TX VI priority error int: %lu\n"
+                  "TX VO priority ok int: %lu\n"
+                  "TX VO priority error int: %lu\n"
+                  "TX BE priority ok int: %lu\n"
+                  "TX BE priority error int: %lu\n"
+                  "TX BK priority ok int: %lu\n"
+                  "TX BK priority error int: %lu\n"
+                  "TX MANAGE priority ok int: %lu\n"
+                  "TX MANAGE priority error int: %lu\n"
+                  "TX BEACON priority ok int: %lu\n"
+                  "TX BEACON priority error int: %lu\n"
+                  "TX queue resume: %lu\n"
+                  "TX queue stopped?: %d\n"
+                  "TX fifo overflow: %lu\n"
+                  "TX VI queue: %d\n"
+                  "TX VO queue: %d\n"
+                  "TX BE queue: %d\n"
+                  "TX BK queue: %d\n"
+                  "TX VI dropped: %lu\n"
+                  "TX VO dropped: %lu\n"
+                  "TX BE dropped: %lu\n"
+                  "TX BK dropped: %lu\n"
+                  "TX total data packets %lu\n",
+                  priv->stats.txviokint,
+                  priv->stats.txvierr,
+                  priv->stats.txvookint,
+                  priv->stats.txvoerr,
+                  priv->stats.txbeokint,
+                  priv->stats.txbeerr,
+                  priv->stats.txbkokint,
+                  priv->stats.txbkerr,
+                  priv->stats.txmanageokint,
+                  priv->stats.txmanageerr,
+                  priv->stats.txbeaconokint,
+                  priv->stats.txbeaconerr,
+                  priv->stats.txresumed,
+                  netif_queue_stopped(dev),
+                  priv->stats.txoverflow,
+                  atomic_read(&(priv->tx_pending[VI_PRIORITY])),
+                  atomic_read(&(priv->tx_pending[VO_PRIORITY])),
+                  atomic_read(&(priv->tx_pending[BE_PRIORITY])),
+                  atomic_read(&(priv->tx_pending[BK_PRIORITY])),
+                  priv->stats.txvidrop,
+                  priv->stats.txvodrop,
+                  priv->stats.txbedrop,
+                  priv->stats.txbkdrop,
+                  priv->stats.txdatapkt
                );
 
        return 0;
@@ -610,12 +575,12 @@ static int proc_get_stats_rx(struct seq_file *m, void *v)
        struct r8192_priv *priv = (struct r8192_priv *)ieee80211_priv(dev);
 
        seq_printf(m,
-               "RX packets: %lu\n"
-               "RX urb status error: %lu\n"
-               "RX invalid urb error: %lu\n",
-               priv->stats.rxoktotal,
-               priv->stats.rxstaterr,
-               priv->stats.rxurberr);
+                  "RX packets: %lu\n"
+                  "RX urb status error: %lu\n"
+                  "RX invalid urb error: %lu\n",
+                  priv->stats.rxoktotal,
+                  priv->stats.rxstaterr,
+                  priv->stats.rxurberr);
 
        return 0;
 }
@@ -700,26 +665,6 @@ void rtl8192_proc_remove_one(struct net_device *dev)
    -----------------------------MISC STUFF-------------------------
 *****************************************************************************/
 
-/* this is only for debugging */
-void print_buffer(u32 *buffer, int len)
-{
-       int i;
-       u8 *buf = (u8 *)buffer;
-
-       printk("ASCII BUFFER DUMP (len: %x):\n", len);
-
-       for (i = 0; i < len; i++)
-               printk("%c", buf[i]);
-
-       printk("\nBINARY BUFFER DUMP (len: %x):\n", len);
-
-       for (i = 0; i < len; i++)
-               printk("%x", buf[i]);
-
-       printk("\n");
-}
-
-//short check_nic_enough_desc(struct net_device *dev, priority_t priority)
 short check_nic_enough_desc(struct net_device *dev, int queue_index)
 {
        struct r8192_priv *priv = ieee80211_priv(dev);
@@ -731,10 +676,8 @@ short check_nic_enough_desc(struct net_device *dev, int queue_index)
 void tx_timeout(struct net_device *dev)
 {
        struct r8192_priv *priv = ieee80211_priv(dev);
-       //rtl8192_commit(dev);
 
        schedule_work(&priv->reset_wq);
-       //DMESG("TXTIMEOUT");
 }
 
 
@@ -746,23 +689,6 @@ void dump_eprom(struct net_device *dev)
                RT_TRACE(COMP_EPROM, "EEPROM addr %x : %x", i, eprom_read(dev, i));
 }
 
-/* this is only for debug */
-void rtl8192_dump_reg(struct net_device *dev)
-{
-       int i;
-       int n;
-       int max = 0x1ff;
-
-       RT_TRACE(COMP_PHY, "Dumping NIC register map");
-
-       for (n = 0; n <= max;)
-       {
-               printk("\nD: %2x> ", n);
-               for (i = 0; i < 16 && n <= max; i++, n++)
-                       printk("%2x ", read_nic_byte(dev, n));
-       }
-       printk("\n");
-}
 
 /****************************************************************************
       ------------------------------HW STUFF---------------------------
@@ -772,11 +698,11 @@ void rtl8192_dump_reg(struct net_device *dev)
 void rtl8192_set_mode(struct net_device *dev, int mode)
 {
        u8 ecmd;
-       ecmd = read_nic_byte(dev, EPROM_CMD);
+       read_nic_byte(dev, EPROM_CMD, &ecmd);
        ecmd = ecmd & ~EPROM_CMD_OPERATING_MODE_MASK;
        ecmd = ecmd | (mode<<EPROM_CMD_OPERATING_MODE_SHIFT);
-       ecmd = ecmd & ~(1<<EPROM_CS_SHIFT);
-       ecmd = ecmd & ~(1<<EPROM_CK_SHIFT);
+       ecmd = ecmd & ~EPROM_CS_BIT;
+       ecmd = ecmd & ~EPROM_CK_BIT;
        write_nic_byte(dev, EPROM_CMD, ecmd);
 }
 
@@ -786,7 +712,7 @@ void rtl8192_update_msr(struct net_device *dev)
        struct r8192_priv *priv = ieee80211_priv(dev);
        u8 msr;
 
-       msr  = read_nic_byte(dev, MSR);
+       read_nic_byte(dev, MSR, &msr);
        msr &= ~MSR_LINK_MASK;
 
        /* do not change in link_state != WLAN_LINK_ASSOCIATED.
@@ -794,7 +720,7 @@ void rtl8192_update_msr(struct net_device *dev)
         * this is intentional and make sense for ad-hoc and
         * master (see the create BSS/IBSS func)
         */
-       if (priv->ieee80211->state == IEEE80211_LINKED){
+       if (priv->ieee80211->state == IEEE80211_LINKED) {
 
                if (priv->ieee80211->iw_mode == IW_MODE_INFRA)
                        msr |= (MSR_LINK_MANAGED<<MSR_LINK_SHIFT);
@@ -803,8 +729,9 @@ void rtl8192_update_msr(struct net_device *dev)
                else if (priv->ieee80211->iw_mode == IW_MODE_MASTER)
                        msr |= (MSR_LINK_MASTER<<MSR_LINK_SHIFT);
 
-       } else
+       } else {
                msr |= (MSR_LINK_NONE<<MSR_LINK_SHIFT);
+       }
 
        write_nic_byte(dev, MSR, msr);
 }
@@ -812,30 +739,21 @@ void rtl8192_update_msr(struct net_device *dev)
 void rtl8192_set_chan(struct net_device *dev, short ch)
 {
        struct r8192_priv *priv = (struct r8192_priv *)ieee80211_priv(dev);
-//     u32 tx;
        RT_TRACE(COMP_CH, "=====>%s()====ch:%d\n", __func__, ch);
        priv->chan = ch;
 
        /* this hack should avoid frame TX during channel setting*/
 
-
-//     tx = read_nic_dword(dev,TX_CONF);
-//     tx &= ~TX_LOOPBACK_MASK;
-
 #ifndef LOOP_TEST
-//     write_nic_dword(dev,TX_CONF, tx |( TX_LOOPBACK_MAC<<TX_LOOPBACK_SHIFT));
-
        //need to implement rf set channel here WB
 
        if (priv->rf_set_chan)
-       priv->rf_set_chan(dev, priv->chan);
+               priv->rf_set_chan(dev, priv->chan);
        mdelay(10);
-//     write_nic_dword(dev,TX_CONF,tx | (TX_LOOPBACK_NONE<<TX_LOOPBACK_SHIFT));
 #endif
 }
 
 static void rtl8192_rx_isr(struct urb *urb);
-//static void rtl8192_rx_isr(struct urb *rx_urb);
 
 u32 get_rxpacket_shiftbytes_819xusb(struct ieee80211_rx_stats *pstats)
 {
@@ -847,7 +765,7 @@ u32 get_rxpacket_shiftbytes_819xusb(struct ieee80211_rx_stats *pstats)
        else
 #endif
                return (sizeof(rx_desc_819x_usb) + pstats->RxDrvInfoSize
-                               + pstats->RxBufShift);
+                       + pstats->RxBufShift);
 
 }
 static int rtl8192_rx_initiate(struct net_device *dev)
@@ -867,7 +785,6 @@ static int rtl8192_rx_initiate(struct net_device *dev)
                        kfree_skb(skb);
                        break;
                }
-//             printk("nomal packet IN request!\n");
                usb_fill_bulk_urb(entry, priv->udev,
                                  usb_rcvbulkpipe(priv->udev, 3), skb_tail_pointer(skb),
                                  RX_URB_SIZE, rtl8192_rx_isr, skb);
@@ -881,7 +798,6 @@ static int rtl8192_rx_initiate(struct net_device *dev)
 
        /* command packet rx procedure */
        while (skb_queue_len(&priv->rx_queue) < MAX_RX_URB + 3) {
-//             printk("command packet IN request!\n");
                skb = __dev_alloc_skb(RX_URB_SIZE, GFP_KERNEL);
                if (!skb)
                        break;
@@ -896,7 +812,7 @@ static int rtl8192_rx_initiate(struct net_device *dev)
                info = (struct rtl8192_rx_info *) skb->cb;
                info->urb = entry;
                info->dev = dev;
-                  info->out_pipe = 9; //denote rx cmd packet queue
+               info->out_pipe = 9; //denote rx cmd packet queue
                skb_queue_tail(&priv->rx_queue, skb);
                usb_submit_urb(entry, GFP_KERNEL);
        }
@@ -909,29 +825,26 @@ void rtl8192_set_rxconf(struct net_device *dev)
        struct r8192_priv *priv = (struct r8192_priv *)ieee80211_priv(dev);
        u32 rxconf;
 
-       rxconf = read_nic_dword(dev, RCR);
+       read_nic_dword(dev, RCR, &rxconf);
        rxconf = rxconf & ~MAC_FILTER_MASK;
        rxconf = rxconf | RCR_AMF;
        rxconf = rxconf | RCR_ADF;
        rxconf = rxconf | RCR_AB;
        rxconf = rxconf | RCR_AM;
-       //rxconf = rxconf | RCR_ACF;
 
-       if (dev->flags & IFF_PROMISC) {DMESG("NIC in promisc mode"); }
+       if (dev->flags & IFF_PROMISC)
+               DMESG("NIC in promisc mode");
 
-       if (priv->ieee80211->iw_mode == IW_MODE_MONITOR || \
-          dev->flags & IFF_PROMISC){
+       if (priv->ieee80211->iw_mode == IW_MODE_MONITOR ||
+           dev->flags & IFF_PROMISC) {
                rxconf = rxconf | RCR_AAP;
-       } /*else if(priv->ieee80211->iw_mode == IW_MODE_MASTER){
-               rxconf = rxconf | (1<<ACCEPT_ALLMAC_FRAME_SHIFT);
-               rxconf = rxconf | (1<<RX_CHECK_BSSID_SHIFT);
-       }*/else{
+       } else {
                rxconf = rxconf | RCR_APM;
                rxconf = rxconf | RCR_CBSSID;
        }
 
 
-       if (priv->ieee80211->iw_mode == IW_MODE_MONITOR){
+       if (priv->ieee80211->iw_mode == IW_MODE_MONITOR) {
                rxconf = rxconf | RCR_AICV;
                rxconf = rxconf | RCR_APWRMGT;
        }
@@ -945,28 +858,14 @@ void rtl8192_set_rxconf(struct net_device *dev)
        rxconf = rxconf & ~MAX_RX_DMA_MASK;
        rxconf = rxconf | ((u32)7<<RCR_MXDMA_OFFSET);
 
-//     rxconf = rxconf | (1<<RX_AUTORESETPHY_SHIFT);
        rxconf = rxconf | RCR_ONLYERLPKT;
 
-//     rxconf = rxconf &~ RCR_CS_MASK;
-//     rxconf = rxconf | (1<<RCR_CS_SHIFT);
-
        write_nic_dword(dev, RCR, rxconf);
-
-       #ifdef DEBUG_RX
-       DMESG("rxconf: %x %x", rxconf, read_nic_dword(dev, RCR));
-       #endif
 }
 //wait to be removed
 void rtl8192_rx_enable(struct net_device *dev)
 {
-       //u8 cmd;
-
-       //struct r8192_priv *priv = (struct r8192_priv *)ieee80211_priv(dev);
-
        rtl8192_rx_initiate(dev);
-
-//     rtl8192_set_rxconf(dev);
 }
 
 
@@ -983,9 +882,8 @@ void rtl8192_rtx_disable(struct net_device *dev)
        struct sk_buff *skb;
        struct rtl8192_rx_info *info;
 
-       cmd = read_nic_byte(dev, CMDR);
-       write_nic_byte(dev, CMDR, cmd & \
-               ~(CR_TE|CR_RE));
+       read_nic_byte(dev, CMDR, &cmd);
+       write_nic_byte(dev, CMDR, cmd & ~(CR_TE|CR_RE));
        force_pci_posting(dev);
        mdelay(10);
 
@@ -998,9 +896,8 @@ void rtl8192_rtx_disable(struct net_device *dev)
                kfree_skb(skb);
        }
 
-       if (skb_queue_len(&priv->skb_queue)) {
-               printk(KERN_WARNING "skb_queue not empty\n");
-       }
+       if (skb_queue_len(&priv->skb_queue))
+               netdev_warn(dev, "skb_queue not empty\n");
 
        skb_queue_purge(&priv->skb_queue);
        return;
@@ -1014,33 +911,33 @@ int alloc_tx_beacon_desc_ring(struct net_device *dev, int count)
 
 inline u16 ieeerate2rtlrate(int rate)
 {
-       switch (rate){
+       switch (rate) {
        case 10:
-       return 0;
+               return 0;
        case 20:
-       return 1;
+               return 1;
        case 55:
-       return 2;
+               return 2;
        case 110:
-       return 3;
+               return 3;
        case 60:
-       return 4;
+               return 4;
        case 90:
-       return 5;
+               return 5;
        case 120:
-       return 6;
+               return 6;
        case 180:
-       return 7;
+               return 7;
        case 240:
-       return 8;
+               return 8;
        case 360:
-       return 9;
+               return 9;
        case 480:
-       return 10;
+               return 10;
        case 540:
-       return 11;
+               return 11;
        default:
-       return 3;
+               return 3;
 
        }
 }
@@ -1068,7 +965,6 @@ static void rtl8192_rx_isr(struct urb *urb)
                priv->stats.rxstaterr++;
                priv->ieee80211->stats.rx_errors++;
                usb_free_urb(urb);
-       //      printk("%s():rx status err\n",__FUNCTION__);
                return;
        }
        skb_unlink(skb, &priv->rx_queue);
@@ -1080,14 +976,14 @@ static void rtl8192_rx_isr(struct urb *urb)
        skb = dev_alloc_skb(RX_URB_SIZE);
        if (unlikely(!skb)) {
                usb_free_urb(urb);
-               printk("%s():can,t alloc skb\n", __func__);
+               netdev_err(dev, "%s(): can't alloc skb\n", __func__);
                /* TODO check rx queue length and refill *somewhere* */
                return;
        }
 
        usb_fill_bulk_urb(urb, priv->udev,
-                       usb_rcvbulkpipe(priv->udev, out_pipe), skb_tail_pointer(skb),
-                       RX_URB_SIZE, rtl8192_rx_isr, skb);
+                         usb_rcvbulkpipe(priv->udev, out_pipe), skb_tail_pointer(skb),
+                         RX_URB_SIZE, rtl8192_rx_isr, skb);
 
        info = (struct rtl8192_rx_info *) skb->cb;
        info->urb = urb;
@@ -1099,30 +995,18 @@ static void rtl8192_rx_isr(struct urb *urb)
        skb_queue_tail(&priv->rx_queue, skb);
        err = usb_submit_urb(urb, GFP_ATOMIC);
        if (err && err != EPERM)
-               printk("can not submit rxurb, err is %x,URB status is %x\n", err, urb->status);
+               netdev_err(dev, "can not submit rxurb, err is %x, URB status is %x\n", err, urb->status);
 }
 
-u32
-rtl819xusb_rx_command_packet(
-       struct net_device *dev,
-       struct ieee80211_rx_stats *pstats
-       )
+u32 rtl819xusb_rx_command_packet(struct net_device *dev,
+                                struct ieee80211_rx_stats *pstats)
 {
        u32     status;
 
-       //RT_TRACE(COMP_RECV, DBG_TRACE, ("---> RxCommandPacketHandle819xUsb()\n"));
-
        status = cmpk_message_handle_rx(dev, pstats);
        if (status)
-       {
                DMESG("rxcommandpackethandle819xusb: It is a command packet\n");
-       }
-       else
-       {
-               //RT_TRACE(COMP_RECV, DBG_TRACE, ("RxCommandPacketHandle819xUsb: It is not a command packet\n"));
-       }
 
-       //RT_TRACE(COMP_RECV, DBG_TRACE, ("<--- RxCommandPacketHandle819xUsb()\n"));
        return status;
 }
 
@@ -1150,24 +1034,17 @@ void rtl8192_hard_data_xmit(struct sk_buff *skb, struct net_device *dev, int rat
        u8 queue_index = tcb_desc->queue_index;
 
        /* shall not be referred by command packet */
-       assert(queue_index != TXCMD_QUEUE);
+       RTL8192U_ASSERT(queue_index != TXCMD_QUEUE);
 
        spin_lock_irqsave(&priv->tx_lock, flags);
 
        memcpy((unsigned char *)(skb->cb), &dev, sizeof(dev));
-//     tcb_desc->RATRIndex = 7;
-//     tcb_desc->bTxDisableRateFallBack = 1;
-//     tcb_desc->bTxUseDriverAssingedRate = 1;
        tcb_desc->bTxEnableFwCalcDur = 1;
        skb_push(skb, priv->ieee80211->tx_headroom);
        ret = rtl8192_tx(dev, skb);
 
-       //priv->ieee80211->stats.tx_bytes+=(skb->len - priv->ieee80211->tx_headroom);
-       //priv->ieee80211->stats.tx_packets++;
-
        spin_unlock_irqrestore(&priv->tx_lock, flags);
 
-//     return ret;
        return;
 }
 
@@ -1211,7 +1088,7 @@ void rtl8192_try_wake_queue(struct net_device *dev, int pri);
 u16 DrvAggr_PaddingAdd(struct net_device *dev, struct sk_buff *skb)
 {
        u16     PaddingNum =  256 - ((skb->len + TX_PACKET_DRVAGGR_SUBFRAME_SHIFT_BYTES) % 256);
-       return  (PaddingNum&0xff);
+       return  PaddingNum & 0xff;
 }
 
 u8 MRateToHwRate8190Pci(u8 rate);
@@ -1250,17 +1127,13 @@ struct sk_buff *DrvAggr_Aggregation(struct net_device *dev, struct ieee80211_drv
        memset(agg_skb->data, 0, agg_skb->len);
        skb_reserve(agg_skb, ieee->tx_headroom);
 
-//     RT_DEBUG_DATA(COMP_SEND, skb->cb, sizeof(skb->cb));
        /* reserve info for first subframe Tx descriptor to be set in the tx function */
        skb = pSendList->tx_agg_frames[0];
        tcb_desc = (cb_desc *)(skb->cb + MAX_DEV_ADDR_SIZE);
        tcb_desc->drv_agg_enable = 1;
        tcb_desc->pkt_size = skb->len;
        tcb_desc->DrvAggrNum = pSendList->nr_drv_agg_frames;
-       printk("DrvAggNum = %d\n", tcb_desc->DrvAggrNum);
-//     RT_DEBUG_DATA(COMP_SEND, skb->cb, sizeof(skb->cb));
-//     printk("========>skb->data ======> \n");
-//     RT_DEBUG_DATA(COMP_SEND, skb->data, skb->len);
+       netdev_dbg(dev, "DrvAggNum = %d\n", tcb_desc->DrvAggrNum);
        memcpy(agg_skb->cb, skb->cb, sizeof(skb->cb));
        memcpy(skb_put(agg_skb, skb->len), skb->data, skb->len);
 
@@ -1276,7 +1149,7 @@ struct sk_buff *DrvAggr_Aggregation(struct net_device *dev, struct ieee80211_drv
 
                memset(tx_fwinfo, 0, sizeof(tx_fwinfo_819x_usb));
                /* DWORD 0 */
-               tx_fwinfo->TxHT = (tcb_desc->data_rate&0x80)?1:0;
+               tx_fwinfo->TxHT = (tcb_desc->data_rate&0x80) ? 1 : 0;
                tx_fwinfo->TxRate = MRateToHwRate8190Pci(tcb_desc->data_rate);
                tx_fwinfo->EnableCPUDur = tcb_desc->bTxEnableFwCalcDur;
                tx_fwinfo->Short = QueryIsShort(tx_fwinfo->TxHT, tx_fwinfo->TxRate, tcb_desc);
@@ -1293,19 +1166,18 @@ struct sk_buff *DrvAggr_Aggregation(struct net_device *dev, struct ieee80211_drv
                }
 
                /* Protection mode related */
-               tx_fwinfo->RtsEnable = (tcb_desc->bRTSEnable)?1:0;
-               tx_fwinfo->CtsEnable = (tcb_desc->bCTSEnable)?1:0;
-               tx_fwinfo->RtsSTBC = (tcb_desc->bRTSSTBC)?1:0;
-               tx_fwinfo->RtsHT = (tcb_desc->rts_rate&0x80)?1:0;
+               tx_fwinfo->RtsEnable = (tcb_desc->bRTSEnable) ? 1 : 0;
+               tx_fwinfo->CtsEnable = (tcb_desc->bCTSEnable) ? 1 : 0;
+               tx_fwinfo->RtsSTBC = (tcb_desc->bRTSSTBC) ? 1 : 0;
+               tx_fwinfo->RtsHT = (tcb_desc->rts_rate&0x80) ? 1 : 0;
                tx_fwinfo->RtsRate =  MRateToHwRate8190Pci((u8)tcb_desc->rts_rate);
-               tx_fwinfo->RtsSubcarrier = (tx_fwinfo->RtsHT == 0)?(tcb_desc->RTSSC):0;
-               tx_fwinfo->RtsBandwidth = (tx_fwinfo->RtsHT == 1)?((tcb_desc->bRTSBW)?1:0):0;
-               tx_fwinfo->RtsShort = (tx_fwinfo->RtsHT == 0)?(tcb_desc->bRTSUseShortPreamble?1:0):\
-                                     (tcb_desc->bRTSUseShortGI?1:0);
+               tx_fwinfo->RtsSubcarrier = (tx_fwinfo->RtsHT == 0) ? (tcb_desc->RTSSC) : 0;
+               tx_fwinfo->RtsBandwidth = (tx_fwinfo->RtsHT == 1) ? ((tcb_desc->bRTSBW) ? 1 : 0) : 0;
+               tx_fwinfo->RtsShort = (tx_fwinfo->RtsHT == 0) ? (tcb_desc->bRTSUseShortPreamble ? 1 : 0) :
+                                     (tcb_desc->bRTSUseShortGI ? 1 : 0);
 
                /* Set Bandwidth and sub-channel settings. */
-               if (priv->CurrentChannelBW == HT_CHANNEL_WIDTH_20_40)
-               {
+               if (priv->CurrentChannelBW == HT_CHANNEL_WIDTH_20_40) {
                        if (tcb_desc->bPacketBW) {
                                tx_fwinfo->TxBandwidth = 1;
                                tx_fwinfo->TxSubCarrier = 0;    //By SD3's Jerry suggestion, use duplicated mode
@@ -1321,8 +1193,6 @@ struct sk_buff *DrvAggr_Aggregation(struct net_device *dev, struct ieee80211_drv
                /* Fill Tx descriptor */
                memset(tx_agg_desc, 0, sizeof(tx_desc_819x_usb_aggr_subframe));
                /* DWORD 0 */
-               //tx_agg_desc->LINIP = 0;
-               //tx_agg_desc->CmdInit = 1;
                tx_agg_desc->Offset =  sizeof(tx_fwinfo_819x_usb) + 8;
                /* already raw data, need not to subtract header length */
                tx_agg_desc->PktSize = skb->len & 0xffff;
@@ -1330,32 +1200,28 @@ struct sk_buff *DrvAggr_Aggregation(struct net_device *dev, struct ieee80211_drv
                /*DWORD 1*/
                tx_agg_desc->SecCAMID = 0;
                tx_agg_desc->RATid = tcb_desc->RATRIndex;
-               {
-                       //MPDUOverhead = 0;
-                       tx_agg_desc->NoEnc = 1;
-               }
+               tx_agg_desc->NoEnc = 1;
                tx_agg_desc->SecType = 0x0;
 
                if (tcb_desc->bHwSec) {
-                       switch (priv->ieee80211->pairwise_key_type)
-                       {
-                               case KEY_TYPE_WEP40:
-                               case KEY_TYPE_WEP104:
-                                       tx_agg_desc->SecType = 0x1;
-                                       tx_agg_desc->NoEnc = 0;
-                                       break;
-                               case KEY_TYPE_TKIP:
-                                       tx_agg_desc->SecType = 0x2;
-                                       tx_agg_desc->NoEnc = 0;
-                                       break;
-                               case KEY_TYPE_CCMP:
-                                       tx_agg_desc->SecType = 0x3;
-                                       tx_agg_desc->NoEnc = 0;
-                                       break;
-                               case KEY_TYPE_NA:
-                                       tx_agg_desc->SecType = 0x0;
-                                       tx_agg_desc->NoEnc = 1;
-                                       break;
+                       switch (priv->ieee80211->pairwise_key_type) {
+                       case KEY_TYPE_WEP40:
+                       case KEY_TYPE_WEP104:
+                               tx_agg_desc->SecType = 0x1;
+                               tx_agg_desc->NoEnc = 0;
+                               break;
+                       case KEY_TYPE_TKIP:
+                               tx_agg_desc->SecType = 0x2;
+                               tx_agg_desc->NoEnc = 0;
+                               break;
+                       case KEY_TYPE_CCMP:
+                               tx_agg_desc->SecType = 0x3;
+                               tx_agg_desc->NoEnc = 0;
+                               break;
+                       case KEY_TYPE_NA:
+                               tx_agg_desc->SecType = 0x0;
+                               tx_agg_desc->NoEnc = 1;
+                               break;
                        }
                }
 
@@ -1369,16 +1235,14 @@ struct sk_buff *DrvAggr_Aggregation(struct net_device *dev, struct ieee80211_drv
 
                //DWORD 2
                /* According windows driver, it seems that there no need to fill this field */
-               //tx_agg_desc->TxBufferSize= (u32)(skb->len - USB_HWDESC_HEADER_LEN);
 
                /* to fill next packet */
                skb_put(agg_skb, TX_PACKET_DRVAGGR_SUBFRAME_SHIFT_BYTES);
                memcpy(skb_put(agg_skb, skb->len), skb->data, skb->len);
        }
 
-       for (i = 0; i < pSendList->nr_drv_agg_frames; i++) {
+       for (i = 0; i < pSendList->nr_drv_agg_frames; i++)
                dev_kfree_skb_any(pSendList->tx_agg_frames[i]);
-       }
 
        return agg_skb;
 }
@@ -1388,7 +1252,7 @@ struct sk_buff *DrvAggr_Aggregation(struct net_device *dev, struct ieee80211_drv
        If no proper TCB is found to do aggregation, SendList will only contain the input TCB.
 */
 u8 DrvAggr_GetAggregatibleList(struct net_device *dev, struct sk_buff *skb,
-               struct ieee80211_drv_agg_txb *pSendList)
+                              struct ieee80211_drv_agg_txb *pSendList)
 {
        struct ieee80211_device *ieee = netdev_priv(dev);
        PRT_HIGH_THROUGHPUT     pHTInfo = ieee->pHTInfo;
@@ -1398,9 +1262,8 @@ u8 DrvAggr_GetAggregatibleList(struct net_device *dev, struct sk_buff *skb,
 
        do {
                pSendList->tx_agg_frames[pSendList->nr_drv_agg_frames++] = skb;
-               if (pSendList->nr_drv_agg_frames >= nMaxAggrNum) {
+               if (pSendList->nr_drv_agg_frames >= nMaxAggrNum)
                        break;
-               }
 
        } while ((skb = skb_dequeue(&ieee->skb_drv_aggQ[QueueID])));
 
@@ -1416,8 +1279,6 @@ static void rtl8192_tx_isr(struct urb *tx_urb)
        struct r8192_priv *priv = NULL;
        cb_desc *tcb_desc = (cb_desc *)(skb->cb + MAX_DEV_ADDR_SIZE);
        u8  queue_index = tcb_desc->queue_index;
-//     bool bToSend0Byte;
-//     u16 BufLen = skb->len;
 
        memcpy(&dev, (struct net_device *)(skb->cb), sizeof(struct net_device *));
        priv = ieee80211_priv(dev);
@@ -1425,15 +1286,11 @@ static void rtl8192_tx_isr(struct urb *tx_urb)
        if (tcb_desc->queue_index != TXCMD_QUEUE) {
                if (tx_urb->status == 0) {
                        dev->trans_start = jiffies;
-                       // Act as station mode, destination shall be unicast address.
-                       //priv->ieee80211->stats.tx_bytes+=(skb->len - priv->ieee80211->tx_headroom);
-                       //priv->ieee80211->stats.tx_packets++;
                        priv->stats.txoktotal++;
                        priv->ieee80211->LinkDetectInfo.NumTxOkInPeriod++;
                        priv->stats.txbytesunicast += (skb->len - priv->ieee80211->tx_headroom);
                } else {
                        priv->ieee80211->stats.tx_errors++;
-                       //priv->stats.txmanageerr++;
                        /* TODO */
                }
        }
@@ -1445,71 +1302,58 @@ static void rtl8192_tx_isr(struct urb *tx_urb)
                atomic_dec(&priv->tx_pending[queue_index]);
        }
 
-       {
-               //
-               // Handle HW Beacon:
-               // We had transfer our beacon frame to host controller at this moment.
-               //
-               //
-               // Caution:
-               // Handling the wait queue of command packets.
-               // For Tx command packets, we must not do TCB fragment because it is not handled right now.
-               // We must cut the packets to match the size of TX_CMD_PKT before we send it.
-               //
+       //
+       // Handle HW Beacon:
+       // We had transfer our beacon frame to host controller at this moment.
+       //
+       //
+       // Caution:
+       // Handling the wait queue of command packets.
+       // For Tx command packets, we must not do TCB fragment because it is not handled right now.
+       // We must cut the packets to match the size of TX_CMD_PKT before we send it.
+       //
 
-               /* Handle MPDU in wait queue. */
-               if (queue_index != BEACON_QUEUE) {
-                       /* Don't send data frame during scanning.*/
-                       if ((skb_queue_len(&priv->ieee80211->skb_waitQ[queue_index]) != 0)&&\
-                                       (!(priv->ieee80211->queue_stop))) {
-                               if (NULL != (skb = skb_dequeue(&(priv->ieee80211->skb_waitQ[queue_index]))))
-                                       priv->ieee80211->softmac_hard_start_xmit(skb, dev);
+       /* Handle MPDU in wait queue. */
+       if (queue_index != BEACON_QUEUE) {
+               /* Don't send data frame during scanning.*/
+               if ((skb_queue_len(&priv->ieee80211->skb_waitQ[queue_index]) != 0) &&
+                   (!(priv->ieee80211->queue_stop))) {
+                       if (NULL != (skb = skb_dequeue(&(priv->ieee80211->skb_waitQ[queue_index]))))
+                               priv->ieee80211->softmac_hard_start_xmit(skb, dev);
 
-                               return; //modified by david to avoid further processing AMSDU
-                       }
+                       return; //modified by david to avoid further processing AMSDU
+               }
 #ifdef USB_TX_DRIVER_AGGREGATION_ENABLE
-                       else if ((skb_queue_len(&priv->ieee80211->skb_drv_aggQ[queue_index]) != 0)&&\
-                               (!(priv->ieee80211->queue_stop))) {
-                               // Tx Driver Aggregation process
-                               /* The driver will aggregation the packets according to the following stats
-                                * 1. check whether there's tx irq available, for it's a completion return
-                                *    function, it should contain enough tx irq;
-                                * 2. check packet type;
-                                * 3. initialize sendlist, check whether the to-be send packet no greater than 1
-                                * 4. aggregates the packets, and fill firmware info and tx desc into it, etc.
-                                * 5. check whether the packet could be sent, otherwise just insert into wait head
-                                * */
-                               skb = skb_dequeue(&priv->ieee80211->skb_drv_aggQ[queue_index]);
-                               if (!check_nic_enough_desc(dev, queue_index)) {
-                                       skb_queue_head(&(priv->ieee80211->skb_drv_aggQ[queue_index]), skb);
-                                       return;
-                               }
+               else if ((skb_queue_len(&priv->ieee80211->skb_drv_aggQ[queue_index]) != 0) &&
+                        (!(priv->ieee80211->queue_stop))) {
+                       // Tx Driver Aggregation process
+                       /* The driver will aggregation the packets according to the following stats
+                        * 1. check whether there's tx irq available, for it's a completion return
+                        *    function, it should contain enough tx irq;
+                        * 2. check packet type;
+                        * 3. initialize sendlist, check whether the to-be send packet no greater than 1
+                        * 4. aggregates the packets, and fill firmware info and tx desc into it, etc.
+                        * 5. check whether the packet could be sent, otherwise just insert into wait head
+                        * */
+                       skb = skb_dequeue(&priv->ieee80211->skb_drv_aggQ[queue_index]);
+                       if (!check_nic_enough_desc(dev, queue_index)) {
+                               skb_queue_head(&(priv->ieee80211->skb_drv_aggQ[queue_index]), skb);
+                               return;
+                       }
+
+                       /*TODO*/
+                       {
+                               struct ieee80211_drv_agg_txb SendList;
+
+                               memset(&SendList, 0, sizeof(struct ieee80211_drv_agg_txb));
+                               if (DrvAggr_GetAggregatibleList(dev, skb, &SendList) > 1) {
+                                       skb = DrvAggr_Aggregation(dev, &SendList);
 
-                               {
-                                       /*TODO*/
-                                       /*
-                                       u8* pHeader = skb->data;
-
-                                       if(IsMgntQosData(pHeader) ||
-                                           IsMgntQData_Ack(pHeader) ||
-                                           IsMgntQData_Poll(pHeader) ||
-                                           IsMgntQData_Poll_Ack(pHeader)
-                                         )
-                                       */
-                                       {
-                                               struct ieee80211_drv_agg_txb SendList;
-
-                                               memset(&SendList, 0, sizeof(struct ieee80211_drv_agg_txb));
-                                               if (DrvAggr_GetAggregatibleList(dev, skb, &SendList) > 1) {
-                                                       skb = DrvAggr_Aggregation(dev, &SendList);
-
-                                               }
-                                       }
-                                       priv->ieee80211->softmac_hard_start_xmit(skb, dev);
                                }
                        }
-#endif
+                       priv->ieee80211->softmac_hard_start_xmit(skb, dev);
                }
+#endif
        }
 
 }
@@ -1519,15 +1363,14 @@ void rtl8192_beacon_stop(struct net_device *dev)
        u8 msr, msrm, msr2;
        struct r8192_priv *priv = ieee80211_priv(dev);
 
-       msr  = read_nic_byte(dev, MSR);
+       read_nic_byte(dev, MSR, &msr);
        msrm = msr & MSR_LINK_MASK;
        msr2 = msr & ~MSR_LINK_MASK;
 
-       if (NIC_8192U == priv->card_8192) {
+       if (NIC_8192U == priv->card_8192)
                usb_kill_urb(priv->rx_urb[MAX_RX_URB]);
-       }
        if ((msrm == (MSR_LINK_ADHOC<<MSR_LINK_SHIFT) ||
-               (msrm == (MSR_LINK_MASTER<<MSR_LINK_SHIFT)))){
+           (msrm == (MSR_LINK_MASTER<<MSR_LINK_SHIFT)))) {
                write_nic_byte(dev, MSR, msr2 | MSR_LINK_NONE);
                write_nic_byte(dev, MSR, msr);
        }
@@ -1535,49 +1378,45 @@ void rtl8192_beacon_stop(struct net_device *dev)
 
 void rtl8192_config_rate(struct net_device *dev, 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;
-
-        for (i = 0; i < net->rates_len; i++)
-        {
-                basic_rate = net->rates[i]&0x7f;
-                switch (basic_rate)
-                {
-                        case MGN_1M:   *rate_config |= RRSR_1M;        break;
-                        case MGN_2M:   *rate_config |= RRSR_2M;        break;
-                        case MGN_5_5M: *rate_config |= RRSR_5_5M;      break;
-                        case MGN_11M:  *rate_config |= RRSR_11M;       break;
-                        case MGN_6M:   *rate_config |= RRSR_6M;        break;
-                        case MGN_9M:   *rate_config |= RRSR_9M;        break;
-                        case MGN_12M:  *rate_config |= RRSR_12M;       break;
-                        case MGN_18M:  *rate_config |= RRSR_18M;       break;
-                        case MGN_24M:  *rate_config |= RRSR_24M;       break;
-                        case MGN_36M:  *rate_config |= RRSR_36M;       break;
-                        case MGN_48M:  *rate_config |= RRSR_48M;       break;
-                        case MGN_54M:  *rate_config |= RRSR_54M;       break;
-                }
-        }
-        for (i = 0; i < net->rates_ex_len; i++)
-        {
-                basic_rate = net->rates_ex[i]&0x7f;
-                switch (basic_rate)
-                {
-                        case MGN_1M:   *rate_config |= RRSR_1M;        break;
-                        case MGN_2M:   *rate_config |= RRSR_2M;        break;
-                        case MGN_5_5M: *rate_config |= RRSR_5_5M;      break;
-                        case MGN_11M:  *rate_config |= RRSR_11M;       break;
-                        case MGN_6M:   *rate_config |= RRSR_6M;        break;
-                        case MGN_9M:   *rate_config |= RRSR_9M;        break;
-                        case MGN_12M:  *rate_config |= RRSR_12M;       break;
-                        case MGN_18M:  *rate_config |= RRSR_18M;       break;
-                        case MGN_24M:  *rate_config |= RRSR_24M;       break;
-                        case MGN_36M:  *rate_config |= RRSR_36M;       break;
-                        case MGN_48M:  *rate_config |= RRSR_48M;       break;
-                        case MGN_54M:  *rate_config |= RRSR_54M;       break;
-                }
-        }
+       struct r8192_priv *priv = ieee80211_priv(dev);
+       struct ieee80211_network *net;
+       u8 i = 0, basic_rate = 0;
+       net = &priv->ieee80211->current_network;
+
+       for (i = 0; i < net->rates_len; i++) {
+               basic_rate = net->rates[i]&0x7f;
+               switch (basic_rate) {
+               case MGN_1M:    *rate_config |= RRSR_1M;        break;
+               case MGN_2M:    *rate_config |= RRSR_2M;        break;
+               case MGN_5_5M:  *rate_config |= RRSR_5_5M;      break;
+               case MGN_11M:   *rate_config |= RRSR_11M;       break;
+               case MGN_6M:    *rate_config |= RRSR_6M;        break;
+               case MGN_9M:    *rate_config |= RRSR_9M;        break;
+               case MGN_12M:   *rate_config |= RRSR_12M;       break;
+               case MGN_18M:   *rate_config |= RRSR_18M;       break;
+               case MGN_24M:   *rate_config |= RRSR_24M;       break;
+               case MGN_36M:   *rate_config |= RRSR_36M;       break;
+               case MGN_48M:   *rate_config |= RRSR_48M;       break;
+               case MGN_54M:   *rate_config |= RRSR_54M;       break;
+               }
+       }
+       for (i = 0; i < net->rates_ex_len; i++) {
+               basic_rate = net->rates_ex[i]&0x7f;
+               switch (basic_rate) {
+               case MGN_1M:    *rate_config |= RRSR_1M;        break;
+               case MGN_2M:    *rate_config |= RRSR_2M;        break;
+               case MGN_5_5M:  *rate_config |= RRSR_5_5M;      break;
+               case MGN_11M:   *rate_config |= RRSR_11M;       break;
+               case MGN_6M:    *rate_config |= RRSR_6M;        break;
+               case MGN_9M:    *rate_config |= RRSR_9M;        break;
+               case MGN_12M:   *rate_config |= RRSR_12M;       break;
+               case MGN_18M:   *rate_config |= RRSR_18M;       break;
+               case MGN_24M:   *rate_config |= RRSR_24M;       break;
+               case MGN_36M:   *rate_config |= RRSR_36M;       break;
+               case MGN_48M:   *rate_config |= RRSR_48M;       break;
+               case MGN_54M:   *rate_config |= RRSR_54M;       break;
+               }
+       }
 }
 
 
@@ -1595,13 +1434,10 @@ void rtl8192_update_cap(struct net_device *dev, u16 cap)
                tmp |= BRSR_AckShortPmb;
        write_nic_dword(dev, RRSR, tmp);
 
-       if (net->mode & (IEEE_G|IEEE_N_24G))
-       {
+       if (net->mode & (IEEE_G|IEEE_N_24G)) {
                u8 slot_time = 0;
-               if ((cap & WLAN_CAPABILITY_SHORT_SLOT)&&(!priv->ieee80211->pHTInfo->bCurrentRT2RTLongSlotTime))
-               {//short slot time
+               if ((cap & WLAN_CAPABILITY_SHORT_SLOT) && (!priv->ieee80211->pHTInfo->bCurrentRT2RTLongSlotTime)) //short slot time
                        slot_time = SHORT_SLOT_TIME;
-               }
                else //long slot time
                        slot_time = NON_SHORT_SLOT_TIME;
                priv->slot_time = slot_time;
@@ -1616,31 +1452,26 @@ void rtl8192_net_update(struct net_device *dev)
        struct ieee80211_network *net;
        u16 BcnTimeCfg = 0, BcnCW = 6, BcnIFS = 0xf;
        u16 rate_config = 0;
-       net = & priv->ieee80211->current_network;
+       net = &priv->ieee80211->current_network;
 
        rtl8192_config_rate(dev, &rate_config);
        priv->basic_rate = rate_config &= 0x15f;
 
        write_nic_dword(dev, BSSIDR, ((u32 *)net->bssid)[0]);
        write_nic_word(dev, BSSIDR+4, ((u16 *)net->bssid)[2]);
-       //for(i=0;i<ETH_ALEN;i++)
-       //      write_nic_byte(dev,BSSID+i,net->bssid[i]);
 
        rtl8192_update_msr(dev);
-//     rtl8192_update_cap(dev, net->capability);
-       if (priv->ieee80211->iw_mode == IW_MODE_ADHOC)
-       {
-       write_nic_word(dev, ATIMWND, 2);
-       write_nic_word(dev, BCN_DMATIME, 1023);
-       write_nic_word(dev, BCN_INTERVAL, net->beacon_interval);
-//     write_nic_word(dev, BcnIntTime, 100);
-       write_nic_word(dev, BCN_DRV_EARLY_INT, 1);
-       write_nic_byte(dev, BCN_ERR_THRESH, 100);
+       if (priv->ieee80211->iw_mode == IW_MODE_ADHOC) {
+               write_nic_word(dev, ATIMWND, 2);
+               write_nic_word(dev, BCN_DMATIME, 1023);
+               write_nic_word(dev, BCN_INTERVAL, net->beacon_interval);
+               write_nic_word(dev, BCN_DRV_EARLY_INT, 1);
+               write_nic_byte(dev, BCN_ERR_THRESH, 100);
                BcnTimeCfg |= (BcnCW<<BCN_TCFG_CW_SHIFT);
-       // TODO: BcnIFS may required to be changed on ASIC
+               // TODO: BcnIFS may required to be changed on ASIC
                BcnTimeCfg |= BcnIFS<<BCN_TCFG_IFS;
 
-       write_nic_word(dev, BCN_TCFG, BcnTimeCfg);
+               write_nic_word(dev, BCN_TCFG, BcnTimeCfg);
        }
 
 
@@ -1662,33 +1493,24 @@ inline u8 rtl8192_IsWirelessBMode(u16 rate)
 
 u16 N_DBPSOfRate(u16 DataRate);
 
-u16 ComputeTxTime(
-       u16             FrameLength,
-       u16             DataRate,
-       u8              bManagementFrame,
-       u8              bShortPreamble
-)
+u16 ComputeTxTime(u16 FrameLength, u16 DataRate, u8 bManagementFrame,
+                 u8 bShortPreamble)
 {
        u16     FrameTime;
        u16     N_DBPS;
        u16     Ceiling;
 
-       if (rtl8192_IsWirelessBMode(DataRate))
-       {
-               if (bManagementFrame || !bShortPreamble || DataRate == 10)
-               {       // long preamble
+       if (rtl8192_IsWirelessBMode(DataRate)) {
+               if (bManagementFrame || !bShortPreamble || DataRate == 10) // long preamble
                        FrameTime = (u16)(144+48+(FrameLength*8/(DataRate/10)));
-               }
-               else
-               {       // Short preamble
+               else // Short preamble
                        FrameTime = (u16)(72+24+(FrameLength*8/(DataRate/10)));
-               }
                if ((FrameLength*8 % (DataRate/10)) != 0) //Get the Ceilling
-                               FrameTime ++;
+                       FrameTime++;
        } else {        //802.11g DSSS-OFDM PLCP length field calculation.
                N_DBPS = N_DBPSOfRate(DataRate);
                Ceiling = (16 + 8*FrameLength + 6) / N_DBPS
-                               + (((16 + 8*FrameLength + 6) % N_DBPS) ? 1 : 0);
+                       + (((16 + 8*FrameLength + 6) % N_DBPS) ? 1 : 0);
                FrameTime = (u16)(16 + 4 + 4*Ceiling + 6);
        }
        return FrameTime;
@@ -1696,47 +1518,46 @@ u16 ComputeTxTime(
 
 u16 N_DBPSOfRate(u16 DataRate)
 {
-        u16 N_DBPS = 24;
+       u16 N_DBPS = 24;
 
-        switch (DataRate)
-        {
-        case 60:
-         N_DBPS = 24;
-         break;
+       switch (DataRate) {
+       case 60:
+               N_DBPS = 24;
+               break;
 
-        case 90:
-         N_DBPS = 36;
-         break;
+       case 90:
+               N_DBPS = 36;
+               break;
 
-        case 120:
-         N_DBPS = 48;
-         break;
+       case 120:
+               N_DBPS = 48;
+               break;
 
-        case 180:
-         N_DBPS = 72;
-         break;
+       case 180:
+               N_DBPS = 72;
+               break;
 
-        case 240:
-         N_DBPS = 96;
-         break;
+       case 240:
+               N_DBPS = 96;
+               break;
 
-        case 360:
-         N_DBPS = 144;
-         break;
+       case 360:
+               N_DBPS = 144;
+               break;
 
-        case 480:
-         N_DBPS = 192;
-         break;
+       case 480:
+               N_DBPS = 192;
+               break;
 
-        case 540:
-         N_DBPS = 216;
-         break;
+       case 540:
+               N_DBPS = 216;
+               break;
 
-        default:
-         break;
-        }
+       default:
+               break;
+       }
 
-        return N_DBPS;
+       return N_DBPS;
 }
 
 void rtl819xU_cmd_isr(struct urb *tx_cmd_urb, struct pt_regs *regs)
@@ -1744,10 +1565,9 @@ void rtl819xU_cmd_isr(struct urb *tx_cmd_urb, struct pt_regs *regs)
        usb_free_urb(tx_cmd_urb);
 }
 
-unsigned int txqueue2outpipe(struct r8192_priv *priv, unsigned int tx_queue) {
-
-       if (tx_queue >= 9)
-       {
+unsigned int txqueue2outpipe(struct r8192_priv *priv, unsigned int tx_queue)
+{
+       if (tx_queue >= 9) {
                RT_TRACE(COMP_ERR, "%s():Unknown queue ID!!!\n", __func__);
                return 0x04;
        }
@@ -1757,19 +1577,16 @@ unsigned int txqueue2outpipe(struct r8192_priv *priv, unsigned int tx_queue) {
 short rtl819xU_tx_cmd(struct net_device *dev, struct sk_buff *skb)
 {
        struct r8192_priv *priv = ieee80211_priv(dev);
-       //u8                    *tx;
        int                     status;
        struct urb              *tx_urb;
-       //int                   urb_buf_len;
        unsigned int            idx_pipe;
        tx_desc_cmd_819x_usb *pdesc = (tx_desc_cmd_819x_usb *)skb->data;
        cb_desc *tcb_desc = (cb_desc *)(skb->cb + MAX_DEV_ADDR_SIZE);
        u8 queue_index = tcb_desc->queue_index;
 
-       //printk("\n %s::queue_index = %d\n",__FUNCTION__, queue_index);
        atomic_inc(&priv->tx_pending[queue_index]);
        tx_urb = usb_alloc_urb(0, GFP_ATOMIC);
-       if (!tx_urb){
+       if (!tx_urb) {
                dev_kfree_skb(skb);
                return -ENOMEM;
        }
@@ -1799,16 +1616,15 @@ short rtl819xU_tx_cmd(struct net_device *dev, struct sk_buff *skb)
                printk("%8x ", tx[i]);
        printk("\n");
 #endif
-       usb_fill_bulk_urb(tx_urb, priv->udev, usb_sndbulkpipe(priv->udev, idx_pipe), \
-                       skb->data, skb->len, rtl8192_tx_isr, skb);
+       usb_fill_bulk_urb(tx_urb, priv->udev, usb_sndbulkpipe(priv->udev, idx_pipe),
+                         skb->data, skb->len, rtl8192_tx_isr, skb);
 
        status = usb_submit_urb(tx_urb, GFP_ATOMIC);
 
-       if (!status){
+       if (!status) {
                return 0;
-       } else{
-               DMESGE("Error TX CMD URB, error %d",
-                               status);
+       } else {
+               DMESGE("Error TX CMD URB, error %d", status);
                return -1;
        }
 }
@@ -1826,19 +1642,19 @@ u8 MapHwQueueToFirmwareQueue(u8 QueueID)
 
        switch (QueueID) {
        case BE_QUEUE:
-               QueueSelect = QSLT_BE;  //or QSelect = pTcb->priority;
+               QueueSelect = QSLT_BE;
                break;
 
        case BK_QUEUE:
-               QueueSelect = QSLT_BK;  //or QSelect = pTcb->priority;
+               QueueSelect = QSLT_BK;
                break;
 
        case VO_QUEUE:
-               QueueSelect = QSLT_VO;  //or QSelect = pTcb->priority;
+               QueueSelect = QSLT_VO;
                break;
 
        case VI_QUEUE:
-               QueueSelect = QSLT_VI;  //or QSelect = pTcb->priority;
+               QueueSelect = QSLT_VI;
                break;
        case MGNT_QUEUE:
                QueueSelect = QSLT_MGNT;
@@ -1850,11 +1666,9 @@ u8 MapHwQueueToFirmwareQueue(u8 QueueID)
 
                // TODO: 2006.10.30 mark other queue selection until we verify it is OK
                // TODO: Remove Assertions
-//#if (RTL819X_FPGA_VER & RTL819X_FPGA_GUANGAN_070502)
        case TXCMD_QUEUE:
                QueueSelect = QSLT_CMD;
                break;
-//#endif
        case HIGH_QUEUE:
                QueueSelect = QSLT_HIGH;
                break;
@@ -1913,7 +1727,7 @@ u8 QueryIsShort(u8 TxHT, u8 TxRate, cb_desc *tcb_desc)
 {
        u8   tmp_Short;
 
-       tmp_Short = (TxHT == 1)?((tcb_desc->bUseShortGI)?1:0):((tcb_desc->bUseShortPreamble)?1:0);
+       tmp_Short = (TxHT == 1) ? ((tcb_desc->bUseShortGI) ? 1 : 0) : ((tcb_desc->bUseShortPreamble) ? 1 : 0);
 
        if (TxHT == 1 && TxRate != DESC90_RATEMCS15)
                tmp_Short = 0;
@@ -1941,23 +1755,20 @@ short rtl8192_tx(struct net_device *dev, struct sk_buff *skb)
        int pend;
        int status;
        struct urb *tx_urb = NULL, *tx_urb_zero = NULL;
-       //int urb_len;
        unsigned int idx_pipe;
-//     RT_DEBUG_DATA(COMP_SEND, tcb_desc, sizeof(cb_desc));
-//     printk("=============> %s\n", __FUNCTION__);
        pend = atomic_read(&priv->tx_pending[tcb_desc->queue_index]);
        /* we are locked here so the two atomic_read and inc are executed
         * without interleaves
         * !!! For debug purpose
         */
-       if (pend > MAX_TX_URB){
-               printk("To discard skb packet!\n");
+       if (pend > MAX_TX_URB) {
+               netdev_dbg(dev, "To discard skb packet!\n");
                dev_kfree_skb_any(skb);
                return -1;
        }
 
        tx_urb = usb_alloc_urb(0, GFP_ATOMIC);
-       if (!tx_urb){
+       if (!tx_urb) {
                dev_kfree_skb_any(skb);
                return -ENOMEM;
        }
@@ -1965,7 +1776,7 @@ short rtl8192_tx(struct net_device *dev, struct sk_buff *skb)
        /* Fill Tx firmware info */
        memset(tx_fwinfo, 0, sizeof(tx_fwinfo_819x_usb));
        /* DWORD 0 */
-       tx_fwinfo->TxHT = (tcb_desc->data_rate&0x80)?1:0;
+       tx_fwinfo->TxHT = (tcb_desc->data_rate&0x80) ? 1 : 0;
        tx_fwinfo->TxRate = MRateToHwRate8190Pci(tcb_desc->data_rate);
        tx_fwinfo->EnableCPUDur = tcb_desc->bTxEnableFwCalcDur;
        tx_fwinfo->Short = QueryIsShort(tx_fwinfo->TxHT, tx_fwinfo->TxRate, tcb_desc);
@@ -1982,19 +1793,18 @@ short rtl8192_tx(struct net_device *dev, struct sk_buff *skb)
        }
 
        /* Protection mode related */
-       tx_fwinfo->RtsEnable = (tcb_desc->bRTSEnable)?1:0;
-       tx_fwinfo->CtsEnable = (tcb_desc->bCTSEnable)?1:0;
-       tx_fwinfo->RtsSTBC = (tcb_desc->bRTSSTBC)?1:0;
-       tx_fwinfo->RtsHT = (tcb_desc->rts_rate&0x80)?1:0;
+       tx_fwinfo->RtsEnable = (tcb_desc->bRTSEnable) ? 1 : 0;
+       tx_fwinfo->CtsEnable = (tcb_desc->bCTSEnable) ? 1 : 0;
+       tx_fwinfo->RtsSTBC = (tcb_desc->bRTSSTBC) ? 1 : 0;
+       tx_fwinfo->RtsHT = (tcb_desc->rts_rate&0x80) ? 1 : 0;
        tx_fwinfo->RtsRate =  MRateToHwRate8190Pci((u8)tcb_desc->rts_rate);
-       tx_fwinfo->RtsSubcarrier = (tx_fwinfo->RtsHT == 0)?(tcb_desc->RTSSC):0;
-       tx_fwinfo->RtsBandwidth = (tx_fwinfo->RtsHT == 1)?((tcb_desc->bRTSBW)?1:0):0;
-       tx_fwinfo->RtsShort = (tx_fwinfo->RtsHT == 0)?(tcb_desc->bRTSUseShortPreamble?1:0):\
-                               (tcb_desc->bRTSUseShortGI?1:0);
+       tx_fwinfo->RtsSubcarrier = (tx_fwinfo->RtsHT == 0) ? (tcb_desc->RTSSC) : 0;
+       tx_fwinfo->RtsBandwidth = (tx_fwinfo->RtsHT == 1) ? ((tcb_desc->bRTSBW) ? 1 : 0) : 0;
+       tx_fwinfo->RtsShort = (tx_fwinfo->RtsHT == 0) ? (tcb_desc->bRTSUseShortPreamble ? 1 : 0) :
+                             (tcb_desc->bRTSUseShortGI ? 1 : 0);
 
        /* Set Bandwidth and sub-channel settings. */
-       if (priv->CurrentChannelBW == HT_CHANNEL_WIDTH_20_40)
-       {
+       if (priv->CurrentChannelBW == HT_CHANNEL_WIDTH_20_40) {
                if (tcb_desc->bPacketBW) {
                        tx_fwinfo->TxBandwidth = 1;
                        tx_fwinfo->TxSubCarrier = 0;    //By SD3's Jerry suggestion, use duplicated mode
@@ -2009,9 +1819,7 @@ short rtl8192_tx(struct net_device *dev, struct sk_buff *skb)
 
 #ifdef USB_TX_DRIVER_AGGREGATION_ENABLE
        if (tcb_desc->drv_agg_enable)
-       {
                tx_fwinfo->Tx_INFO_RSVD = (tcb_desc->DrvAggrNum & 0x1f) << 1;
-       }
 #endif
        /* Fill Tx descriptor */
        memset(tx_desc, 0, sizeof(tx_desc_819x_usb));
@@ -2021,9 +1829,9 @@ short rtl8192_tx(struct net_device *dev, struct sk_buff *skb)
        tx_desc->Offset =  sizeof(tx_fwinfo_819x_usb) + 8;
 
 #ifdef USB_TX_DRIVER_AGGREGATION_ENABLE
-       if (tcb_desc->drv_agg_enable) {
+       if (tcb_desc->drv_agg_enable)
                tx_desc->PktSize = tcb_desc->pkt_size;
-       else
+       else
 #endif
        {
                tx_desc->PktSize = (skb->len - TX_PACKET_SHIFT_BYTES) & 0xffff;
@@ -2032,34 +1840,29 @@ short rtl8192_tx(struct net_device *dev, struct sk_buff *skb)
        /*DWORD 1*/
        tx_desc->SecCAMID = 0;
        tx_desc->RATid = tcb_desc->RATRIndex;
-       {
-               //MPDUOverhead = 0;
-               tx_desc->NoEnc = 1;
-       }
+       tx_desc->NoEnc = 1;
        tx_desc->SecType = 0x0;
-               if (tcb_desc->bHwSec)
-                       {
-                               switch (priv->ieee80211->pairwise_key_type)
-                               {
-                                       case KEY_TYPE_WEP40:
-                                       case KEY_TYPE_WEP104:
-                                                tx_desc->SecType = 0x1;
-                                                tx_desc->NoEnc = 0;
-                                                break;
-                                       case KEY_TYPE_TKIP:
-                                                tx_desc->SecType = 0x2;
-                                                tx_desc->NoEnc = 0;
-                                                break;
-                                       case KEY_TYPE_CCMP:
-                                                tx_desc->SecType = 0x3;
-                                                tx_desc->NoEnc = 0;
-                                                break;
-                                       case KEY_TYPE_NA:
-                                                tx_desc->SecType = 0x0;
-                                                tx_desc->NoEnc = 1;
-                                                break;
-                               }
-                       }
+       if (tcb_desc->bHwSec) {
+               switch (priv->ieee80211->pairwise_key_type) {
+               case KEY_TYPE_WEP40:
+               case KEY_TYPE_WEP104:
+                       tx_desc->SecType = 0x1;
+                       tx_desc->NoEnc = 0;
+                       break;
+               case KEY_TYPE_TKIP:
+                       tx_desc->SecType = 0x2;
+                       tx_desc->NoEnc = 0;
+                       break;
+               case KEY_TYPE_CCMP:
+                       tx_desc->SecType = 0x3;
+                       tx_desc->NoEnc = 0;
+                       break;
+               case KEY_TYPE_NA:
+                       tx_desc->SecType = 0x0;
+                       tx_desc->NoEnc = 1;
+                       break;
+               }
+       }
 
        tx_desc->QueueSelect = MapHwQueueToFirmwareQueue(tcb_desc->queue_index);
        tx_desc->TxFWInfoSize =  sizeof(tx_fwinfo_819x_usb);
@@ -2089,43 +1892,36 @@ short rtl8192_tx(struct net_device *dev, struct sk_buff *skb)
        idx_pipe = 0x5;
 #endif
 
-       //RT_DEBUG_DATA(COMP_SEND,tx_fwinfo,sizeof(tx_fwinfo_819x_usb));
-       //RT_DEBUG_DATA(COMP_SEND,tx_desc,sizeof(tx_desc_819x_usb));
-
        /* To submit bulk urb */
        usb_fill_bulk_urb(tx_urb, udev,
-                       usb_sndbulkpipe(udev, idx_pipe), skb->data,
-                       skb->len, rtl8192_tx_isr, skb);
+                         usb_sndbulkpipe(udev, idx_pipe), skb->data,
+                         skb->len, rtl8192_tx_isr, skb);
 
        status = usb_submit_urb(tx_urb, GFP_ATOMIC);
-       if (!status){
-//we need to send 0 byte packet whenever 512N bytes/64N(HIGN SPEED/NORMAL SPEED) bytes packet has been transmitted. Otherwise, it will be halt to wait for another packet. WB. 2008.08.27
+       if (!status) {
+               //we need to send 0 byte packet whenever 512N bytes/64N(HIGN SPEED/NORMAL SPEED) bytes packet has been transmitted. Otherwise, it will be halt to wait for another packet. WB. 2008.08.27
                bool bSend0Byte = false;
                u8 zero = 0;
-               if (udev->speed == USB_SPEED_HIGH)
-               {
+               if (udev->speed == USB_SPEED_HIGH) {
                        if (skb->len > 0 && skb->len % 512 == 0)
                                bSend0Byte = true;
-               }
-               else
-               {
+               } else {
                        if (skb->len > 0 && skb->len % 64 == 0)
                                bSend0Byte = true;
                }
-               if (bSend0Byte)
-               {
+               if (bSend0Byte) {
                        tx_urb_zero = usb_alloc_urb(0, GFP_ATOMIC);
-                       if (!tx_urb_zero){
+                       if (!tx_urb_zero) {
                                RT_TRACE(COMP_ERR, "can't alloc urb for zero byte\n");
                                return -ENOMEM;
                        }
                        usb_fill_bulk_urb(tx_urb_zero, udev,
-                                       usb_sndbulkpipe(udev, idx_pipe), &zero,
-                                       0, tx_zero_isr, dev);
+                                         usb_sndbulkpipe(udev, idx_pipe), &zero,
+                                         0, tx_zero_isr, dev);
                        status = usb_submit_urb(tx_urb_zero, GFP_ATOMIC);
-                       if (status){
-                       RT_TRACE(COMP_ERR, "Error TX URB for zero byte %d, error %d", atomic_read(&priv->tx_pending[tcb_desc->queue_index]), status);
-                       return -1;
+                       if (status) {
+                               RT_TRACE(COMP_ERR, "Error TX URB for zero byte %d, error %d", atomic_read(&priv->tx_pending[tcb_desc->queue_index]), status);
+                               return -1;
                        }
                }
                dev->trans_start = jiffies;
@@ -2133,7 +1929,7 @@ short rtl8192_tx(struct net_device *dev, struct sk_buff *skb)
                return 0;
        } else {
                RT_TRACE(COMP_ERR, "Error TX URB %d, error %d", atomic_read(&priv->tx_pending[tcb_desc->queue_index]),
-                               status);
+                        status);
                return -1;
        }
 }
@@ -2143,12 +1939,12 @@ short rtl8192_usb_initendpoints(struct net_device *dev)
        struct r8192_priv *priv = ieee80211_priv(dev);
 
        priv->rx_urb = kmalloc(sizeof(struct urb *) * (MAX_RX_URB+1),
-                               GFP_KERNEL);
+                              GFP_KERNEL);
        if (priv->rx_urb == NULL)
                return -ENOMEM;
 
 #ifndef JACKSON_NEW_RX
-       for (i = 0; i < (MAX_RX_URB+1); i++){
+       for (i = 0; i < (MAX_RX_URB+1); i++) {
 
                priv->rx_urb[i] = usb_alloc_urb(0, GFP_KERNEL);
 
@@ -2159,23 +1955,23 @@ short rtl8192_usb_initendpoints(struct net_device *dev)
 #endif
 
 #ifdef THOMAS_BEACON
-{
-       long align = 0;
-       void *oldaddr, *newaddr;
-
-       priv->rx_urb[16] = usb_alloc_urb(0, GFP_KERNEL);
-       priv->oldaddr = kmalloc(16, GFP_KERNEL);
-       oldaddr = priv->oldaddr;
-       align = ((long)oldaddr) & 3;
-       if (align) {
-               newaddr = oldaddr + 4 - align;
-               priv->rx_urb[16]->transfer_buffer_length = 16 - 4 + align;
-       } else {
-               newaddr = oldaddr;
-               priv->rx_urb[16]->transfer_buffer_length = 16;
+       {
+               long align = 0;
+               void *oldaddr, *newaddr;
+
+               priv->rx_urb[16] = usb_alloc_urb(0, GFP_KERNEL);
+               priv->oldaddr = kmalloc(16, GFP_KERNEL);
+               oldaddr = priv->oldaddr;
+               align = ((long)oldaddr) & 3;
+               if (align) {
+                       newaddr = oldaddr + 4 - align;
+                       priv->rx_urb[16]->transfer_buffer_length = 16 - 4 + align;
+               } else {
+                       newaddr = oldaddr;
+                       priv->rx_urb[16]->transfer_buffer_length = 16;
+               }
+               priv->rx_urb[16]->transfer_buffer = newaddr;
        }
-       priv->rx_urb[16]->transfer_buffer = newaddr;
-}
 #endif
 
        memset(priv->rx_urb, 0, sizeof(struct urb *) * MAX_RX_URB);
@@ -2191,7 +1987,7 @@ short rtl8192_usb_initendpoints(struct net_device *dev)
                return -ENOMEM;
        }
 
-       printk("End of initendpoints\n");
+       netdev_dbg(dev, "End of initendpoints\n");
        return 0;
 
 }
@@ -2201,8 +1997,8 @@ void rtl8192_usb_deleteendpoints(struct net_device *dev)
        int i;
        struct r8192_priv *priv = ieee80211_priv(dev);
 
-       if (priv->rx_urb){
-               for (i = 0; i < (MAX_RX_URB+1); i++){
+       if (priv->rx_urb) {
+               for (i = 0; i < (MAX_RX_URB+1); i++) {
                        usb_kill_urb(priv->rx_urb[i]);
                        usb_free_urb(priv->rx_urb[i]);
                }
@@ -2224,8 +2020,8 @@ void rtl8192_usb_deleteendpoints(struct net_device *dev)
 
 #ifndef JACKSON_NEW_RX
 
-       if (priv->rx_urb){
-               for (i = 0; i < (MAX_RX_URB+1); i++){
+       if (priv->rx_urb) {
+               for (i = 0; i < (MAX_RX_URB+1); i++) {
                        usb_kill_urb(priv->rx_urb[i]);
                        kfree(priv->rx_urb[i]->transfer_buffer);
                        usb_free_urb(priv->rx_urb[i]);
@@ -2252,34 +2048,25 @@ void rtl8192_usb_deleteendpoints(struct net_device *dev)
 extern void rtl8192_update_ratr_table(struct net_device *dev);
 void rtl8192_link_change(struct net_device *dev)
 {
-//     int i;
-
        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)
-       {
+       if (ieee->state == IEEE80211_LINKED) {
                rtl8192_net_update(dev);
                rtl8192_update_ratr_table(dev);
                //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);
+                       EnableHWSecurityConfig8192(dev);
        }
        /*update timing params*/
-//     RT_TRACE(COMP_CH, "========>%s(), chan:%d\n", __FUNCTION__, priv->chan);
-//     rtl8192_set_chan(dev, priv->chan);
-        if (ieee->iw_mode == IW_MODE_INFRA || ieee->iw_mode == IW_MODE_ADHOC)
-       {
+       if (ieee->iw_mode == IW_MODE_INFRA || ieee->iw_mode == IW_MODE_ADHOC) {
                u32 reg = 0;
-               reg = read_nic_dword(dev, RCR);
+               read_nic_dword(dev, RCR, &reg);
                if (priv->ieee80211->state == IEEE80211_LINKED)
                        priv->ReceiveConfig = reg |= RCR_CBSSID;
                else
                        priv->ReceiveConfig = reg &= ~RCR_CBSSID;
                write_nic_dword(dev, RCR, reg);
        }
-
-//     rtl8192_set_rxconf(dev);
 }
 
 static struct ieee80211_qos_parameters def_qos_parameters = {
@@ -2313,7 +2100,6 @@ void rtl8192_qos_activate(struct work_struct *work)
        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;
-       //u32 size = sizeof(struct ieee80211_qos_parameters);
        u8  u1bAIFS;
        u32 u4bAcParam;
        int i;
@@ -2321,7 +2107,7 @@ void rtl8192_qos_activate(struct work_struct *work)
        if (priv == NULL)
                return;
 
-       mutex_lock(&priv->mutex);
+       mutex_lock(&priv->mutex);
        if (priv->ieee80211->state != IEEE80211_LINKED)
                goto success;
        RT_TRACE(COMP_QOS, "qos active process with associate response received\n");
@@ -2330,23 +2116,22 @@ void rtl8192_qos_activate(struct work_struct *work)
        /* update the ac parameter to related registers */
        for (i = 0; i <  QOS_QUEUE_NUM; i++) {
                //Mode G/A: slotTimeTimer = 9; Mode B: 20
-               u1bAIFS = qos_parameters->aifs[i] * ((mode&(IEEE_G|IEEE_N_24G)) ?9:20) + aSifsTime;
+               u1bAIFS = qos_parameters->aifs[i] * ((mode&(IEEE_G|IEEE_N_24G)) ? 9 : 20) + aSifsTime;
                u4bAcParam = ((((u32)(qos_parameters->tx_op_limit[i]))<< AC_PARAM_TXOP_LIMIT_OFFSET)|
-                               (((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));
+                             (((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);
        }
 
 success:
-       mutex_unlock(&priv->mutex);
+       mutex_unlock(&priv->mutex);
 }
 
 static int rtl8192_qos_handle_probe_response(struct r8192_priv *priv,
-               int active_network,
-               struct ieee80211_network *network)
+                                            int active_network,
+                                            struct ieee80211_network *network)
 {
        int ret = 0;
        u32 size = sizeof(struct ieee80211_qos_parameters);
@@ -2359,21 +2144,21 @@ static int rtl8192_qos_handle_probe_response(struct r8192_priv *priv,
 
        if (network->flags & NETWORK_HAS_QOS_MASK) {
                if (active_network &&
-                               (network->flags & NETWORK_HAS_QOS_PARAMETERS))
+                   (network->flags & NETWORK_HAS_QOS_PARAMETERS))
                        network->qos_data.active = network->qos_data.supported;
 
                if ((network->qos_data.active == 1) && (active_network == 1) &&
-                               (network->flags & NETWORK_HAS_QOS_PARAMETERS) &&
-                               (network->qos_data.old_param_count !=
-                                network->qos_data.param_count)) {
+                   (network->flags & NETWORK_HAS_QOS_PARAMETERS) &&
+                   (network->qos_data.old_param_count !=
+                    network->qos_data.param_count)) {
                        network->qos_data.old_param_count =
                                network->qos_data.param_count;
                        queue_work(priv->priv_wq, &priv->qos_activate);
                        RT_TRACE(COMP_QOS, "QoS parameters change call "
-                                       "qos_activate\n");
+                                "qos_activate\n");
                }
        } else {
-               memcpy(&priv->ieee80211->current_network.qos_data.parameters,\
+               memcpy(&priv->ieee80211->current_network.qos_data.parameters,
                       &def_qos_parameters, size);
 
                if ((network->qos_data.active == 1) && (active_network == 1)) {
@@ -2389,8 +2174,8 @@ static int rtl8192_qos_handle_probe_response(struct r8192_priv *priv,
 
 /* handle and manage frame from beacon and probe response */
 static int rtl8192_handle_beacon(struct net_device *dev,
-                             struct ieee80211_beacon *beacon,
-                             struct ieee80211_network *network)
+                                struct ieee80211_beacon *beacon,
+                                struct ieee80211_network *network)
 {
        struct r8192_priv *priv = ieee80211_priv(dev);
 
@@ -2406,7 +2191,7 @@ static int rtl8192_handle_beacon(struct net_device *dev,
 * setting
 */
 static int rtl8192_qos_association_resp(struct r8192_priv *priv,
-                                   struct ieee80211_network *network)
+                                       struct ieee80211_network *network)
 {
        int ret = 0;
        unsigned long flags;
@@ -2424,20 +2209,18 @@ static int rtl8192_qos_association_resp(struct r8192_priv *priv,
 
        spin_lock_irqsave(&priv->ieee80211->lock, flags);
        if (network->flags & NETWORK_HAS_QOS_PARAMETERS) {
-               memcpy(&priv->ieee80211->current_network.qos_data.parameters,\
-                        &network->qos_data.parameters,\
-                       sizeof(struct ieee80211_qos_parameters));
+               memcpy(&priv->ieee80211->current_network.qos_data.parameters,
+                      &network->qos_data.parameters,
+                      sizeof(struct ieee80211_qos_parameters));
                priv->ieee80211->current_network.qos_data.active = 1;
-                {
-                       set_qos_param = 1;
-                       /* update qos parameter for current network */
-                       priv->ieee80211->current_network.qos_data.old_param_count = \
-                                priv->ieee80211->current_network.qos_data.param_count;
-                       priv->ieee80211->current_network.qos_data.param_count = \
-                                network->qos_data.param_count;
-               }
+               set_qos_param = 1;
+               /* update qos parameter for current network */
+               priv->ieee80211->current_network.qos_data.old_param_count =
+                       priv->ieee80211->current_network.qos_data.param_count;
+               priv->ieee80211->current_network.qos_data.param_count =
+                       network->qos_data.param_count;
        } else {
-               memcpy(&priv->ieee80211->current_network.qos_data.parameters,\
+               memcpy(&priv->ieee80211->current_network.qos_data.parameters,
                       &def_qos_parameters, size);
                priv->ieee80211->current_network.qos_data.active = 0;
                priv->ieee80211->current_network.qos_data.supported = 0;
@@ -2456,8 +2239,8 @@ static int rtl8192_qos_association_resp(struct r8192_priv *priv,
 
 
 static int rtl8192_handle_assoc_response(struct net_device *dev,
-                                    struct ieee80211_assoc_response_frame *resp,
-                                    struct ieee80211_network *network)
+                                        struct ieee80211_assoc_response_frame *resp,
+                                        struct ieee80211_network *network)
 {
        struct r8192_priv *priv = ieee80211_priv(dev);
        rtl8192_qos_association_resp(priv, network);
@@ -2466,50 +2249,43 @@ static int rtl8192_handle_assoc_response(struct net_device *dev,
 
 
 void rtl8192_update_ratr_table(struct net_device *dev)
-       //      POCTET_STRING   posLegacyRate,
-       //      u8*                     pMcsRate)
-       //      PRT_WLAN_STA    pEntry)
 {
        struct r8192_priv *priv = ieee80211_priv(dev);
        struct ieee80211_device *ieee = priv->ieee80211;
        u8 *pMcsRate = ieee->dot11HTOperationalRateSet;
-       //struct ieee80211_network *net = &ieee->current_network;
        u32 ratr_value = 0;
        u8 rate_index = 0;
        rtl8192_config_rate(dev, (u16 *)(&ratr_value));
        ratr_value |= (*(u16 *)(pMcsRate)) << 12;
-//     switch (net->mode)
-       switch (ieee->mode)
-       {
-               case IEEE_A:
-                       ratr_value &= 0x00000FF0;
-                       break;
-               case IEEE_B:
-                       ratr_value &= 0x0000000F;
-                       break;
-               case IEEE_G:
-                       ratr_value &= 0x00000FF7;
-                       break;
-               case IEEE_N_24G:
-               case IEEE_N_5G:
-                       if (ieee->pHTInfo->PeerMimoPs == 0) //MIMO_PS_STATIC
-                               ratr_value &= 0x0007F007;
-                       else{
-                               if (priv->rf_type == RF_1T2R)
-                                       ratr_value &= 0x000FF007;
-                               else
-                                       ratr_value &= 0x0F81F007;
-                       }
-                       break;
-               default:
-                       break;
+       switch (ieee->mode) {
+       case IEEE_A:
+               ratr_value &= 0x00000FF0;
+               break;
+       case IEEE_B:
+               ratr_value &= 0x0000000F;
+               break;
+       case IEEE_G:
+               ratr_value &= 0x00000FF7;
+               break;
+       case IEEE_N_24G:
+       case IEEE_N_5G:
+               if (ieee->pHTInfo->PeerMimoPs == 0) {//MIMO_PS_STATIC
+                       ratr_value &= 0x0007F007;
+               } else {
+                       if (priv->rf_type == RF_1T2R)
+                               ratr_value &= 0x000FF007;
+                       else
+                               ratr_value &= 0x0F81F007;
+               }
+               break;
+       default:
+               break;
        }
        ratr_value &= 0x0FFFFFFF;
-       if (ieee->pHTInfo->bCurTxBW40MHz && ieee->pHTInfo->bCurShortGI40MHz){
+       if (ieee->pHTInfo->bCurTxBW40MHz && ieee->pHTInfo->bCurShortGI40MHz)
                ratr_value |= 0x80000000;
-       } else if (!ieee->pHTInfo->bCurTxBW40MHz && ieee->pHTInfo->bCurShortGI20MHz){
+       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);
 }
@@ -2533,10 +2309,8 @@ bool GetNmodeSupportBySecCfg8192(struct net_device *dev)
        if (encrypt && (wpa_ie_len == 0)) {
                /* wep encryption, no N mode setting */
                return false;
-//     } else if((wpa_ie_len != 0)&&(memcmp(&(ieee->wpa_ie[14]),ccmp_ie,4))) {
        } else if ((wpa_ie_len != 0)) {
                /* parse pairwise key type */
-               //if((pairwisekey = WEP40)||(pairwisekey = WEP104)||(pairwisekey = TKIP))
                if (((ieee->wpa_ie[0] == 0xdd) && (!memcmp(&(ieee->wpa_ie[14]), ccmp_ie, 4))) || ((ieee->wpa_ie[0] == 0x30) && (!memcmp(&ieee->wpa_ie[10], ccmp_rsn_ie, 4))))
                        return true;
                else
@@ -2567,11 +2341,7 @@ void rtl8192_refresh_supportrate(struct r8192_priv *priv)
        struct ieee80211_device *ieee = priv->ieee80211;
        //we do not consider set support rate for ABG mode, only HT MCS rate is set here.
        if (ieee->mode == WIRELESS_MODE_N_24G || ieee->mode == WIRELESS_MODE_N_5G)
-       {
                memcpy(ieee->Regdot11HTOperationalRateSet, ieee->RegHTSuppRateSet, 16);
-               //RT_DEBUG_DATA(COMP_INIT, ieee->RegHTSuppRateSet, 16);
-               //RT_DEBUG_DATA(COMP_INIT, ieee->Regdot11HTOperationalRateSet, 16);
-       }
        else
                memset(ieee->Regdot11HTOperationalRateSet, 0, 16);
        return;
@@ -2581,19 +2351,18 @@ u8 rtl8192_getSupportedWireleeMode(struct net_device *dev)
 {
        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;
+       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;
 }
@@ -2602,29 +2371,18 @@ void rtl8192_SetWirelessMode(struct net_device *dev, u8 wireless_mode)
        struct r8192_priv *priv = ieee80211_priv(dev);
        u8 bSupportMode = rtl8192_getSupportedWireleeMode(dev);
 
-       if ((wireless_mode == WIRELESS_MODE_AUTO) || ((wireless_mode&bSupportMode) == 0))
-       {
-               if (bSupportMode & WIRELESS_MODE_N_24G)
-               {
+       if ((wireless_mode == WIRELESS_MODE_AUTO) || ((wireless_mode&bSupportMode) == 0)) {
+               if (bSupportMode & WIRELESS_MODE_N_24G) {
                        wireless_mode = WIRELESS_MODE_N_24G;
-               }
-               else if (bSupportMode & WIRELESS_MODE_N_5G)
-               {
+               } else if (bSupportMode & WIRELESS_MODE_N_5G) {
                        wireless_mode = WIRELESS_MODE_N_5G;
-               }
-               else if ((bSupportMode & WIRELESS_MODE_A))
-               {
+               } else if ((bSupportMode & WIRELESS_MODE_A)) {
                        wireless_mode = WIRELESS_MODE_A;
-               }
-               else if ((bSupportMode & WIRELESS_MODE_G))
-               {
+               } else if ((bSupportMode & WIRELESS_MODE_G)) {
                        wireless_mode = WIRELESS_MODE_G;
-               }
-               else if ((bSupportMode & WIRELESS_MODE_B))
-               {
+               } else if ((bSupportMode & WIRELESS_MODE_B)) {
                        wireless_mode = WIRELESS_MODE_B;
-               }
-               else{
+               } else {
                        RT_TRACE(COMP_ERR, "%s(), No valid wireless mode supported, SupportedWirelessMode(%x)!!!\n", __func__, bSupportMode);
                        wireless_mode = WIRELESS_MODE_B;
                }
@@ -2657,7 +2415,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 = (dev->flags & IFF_PROMISC) ? 1 : 0;
        priv->CckPwEnl = 6;
        //for silent reset
        priv->IrpPendingCount = 1;
@@ -2672,14 +2430,14 @@ static void rtl8192_init_priv_variable(struct net_device *dev)
        priv->ieee80211->softmac_features  = IEEE_SOFTMAC_SCAN |
                IEEE_SOFTMAC_ASSOCIATE | IEEE_SOFTMAC_PROBERQ |
                IEEE_SOFTMAC_PROBERS | IEEE_SOFTMAC_TX_QUEUE |
-               IEEE_SOFTMAC_BEACONS;//added by amy 080604 //|  //IEEE_SOFTMAC_SINGLE_QUEUE;
+               IEEE_SOFTMAC_BEACONS;//added by amy 080604
 
        priv->ieee80211->active_scan = 1;
        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 = NULL; //-by amy 080604
+       priv->ieee80211->stop_send_beacons = NULL;  //-by amy 080604
        priv->ieee80211->softmac_hard_start_xmit = rtl8192_hard_start_xmit;
        priv->ieee80211->set_chan = rtl8192_set_chan;
        priv->ieee80211->link_change = rtl8192_link_change;
@@ -2693,7 +2451,6 @@ static void rtl8192_init_priv_variable(struct net_device *dev)
        priv->ieee80211->qos_support = 1;
 
        //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;
@@ -2705,36 +2462,31 @@ static void rtl8192_init_priv_variable(struct net_device *dev)
        priv->ieee80211->InitialGainHandler = InitialGain819xUsb;
        priv->card_type = USB;
 #ifdef TO_DO_LIST
-       if (Adapter->bInHctTest)
-       {
+       if (Adapter->bInHctTest) {
                pHalData->ShortRetryLimit = 7;
                pHalData->LongRetryLimit = 7;
        }
 #endif
-       {
-               priv->ShortRetryLimit = 0x30;
-               priv->LongRetryLimit = 0x30;
-       }
+       priv->ShortRetryLimit = 0x30;
+       priv->LongRetryLimit = 0x30;
        priv->EarlyRxThreshold = 7;
        priv->enable_gpio0 = 0;
        priv->TransmitConfig =
-       //      TCR_DurProcMode |       //for RTL8185B, duration setting by HW
-       //?     TCR_DISReqQsize |
                (TCR_MXDMA_2048<<TCR_MXDMA_OFFSET)|  // Max DMA Burst Size per Tx DMA Burst, 7: reserved.
                (priv->ShortRetryLimit<<TCR_SRL_OFFSET)|        // Short retry limit
                (priv->LongRetryLimit<<TCR_LRL_OFFSET) |        // Long retry limit
-               (false ? TCR_SAT: 0);   // FALSE: HW provides PLCP length and LENGEXT, TRUE: SW provides them
+               (false ? TCR_SAT : 0);  // FALSE: HW provides PLCP length and LENGEXT, TRUE: SW provides them
 #ifdef TO_DO_LIST
        if (Adapter->bInHctTest)
                pHalData->ReceiveConfig =       pHalData->CSMethod |
-                                               RCR_AMF | RCR_ADF |     //RCR_AAP |     //accept management/data
+                                               RCR_AMF | RCR_ADF |     //accept management/data
                                                //guangan200710
                                                RCR_ACF |       //accept control frame for SW AP needs PS-poll, 2005.07.07, by rcnjko.
                                                RCR_AB | RCR_AM | RCR_APM |             //accept BC/MC/UC
                                                RCR_AICV | RCR_ACRC32 |                 //accept ICV/CRC error packet
                                                ((u32)7<<RCR_MXDMA_OFFSET) | // Max DMA Burst Size per Rx DMA Burst, 7: unlimited.
                                                (pHalData->EarlyRxThreshold<<RCR_FIFO_OFFSET) | // Rx FIFO Threshold, 7: No Rx threshold.
-                                               (pHalData->EarlyRxThreshold == 7 ? RCR_OnlyErlPkt:0);
+                                               (pHalData->EarlyRxThreshold == 7 ? RCR_OnlyErlPkt : 0);
        else
 
 #endif
@@ -2742,10 +2494,9 @@ static void rtl8192_init_priv_variable(struct net_device *dev)
                RCR_AMF | RCR_ADF |             //accept management/data
                RCR_ACF |                       //accept control frame for SW AP needs PS-poll, 2005.07.07, by rcnjko.
                RCR_AB | RCR_AM | RCR_APM |     //accept BC/MC/UC
-               //RCR_AICV | RCR_ACRC32 |       //accept ICV/CRC error packet
                ((u32)7<<RCR_MXDMA_OFFSET)| // Max DMA Burst Size per Rx DMA Burst, 7: unlimited.
                (priv->EarlyRxThreshold<<RX_FIFO_THRESHOLD_SHIFT) | // Rx FIFO Threshold, 7: No Rx threshold.
-               (priv->EarlyRxThreshold == 7 ? RCR_ONLYERLPKT:0);
+               (priv->EarlyRxThreshold == 7 ? RCR_ONLYERLPKT : 0);
 
        priv->AcmControl = 0;
        priv->pFirmware = kzalloc(sizeof(rt_firmware), GFP_KERNEL);
@@ -2755,15 +2506,12 @@ static void rtl8192_init_priv_variable(struct net_device *dev)
        skb_queue_head_init(&priv->skb_queue);
 
        /* Tx related queue */
-       for (i = 0; i < MAX_QUEUE_SIZE; i++) {
-               skb_queue_head_init(&priv->ieee80211->skb_waitQ [i]);
-       }
-       for (i = 0; i < MAX_QUEUE_SIZE; i++) {
-               skb_queue_head_init(&priv->ieee80211->skb_aggQ [i]);
-       }
-       for (i = 0; i < MAX_QUEUE_SIZE; i++) {
-               skb_queue_head_init(&priv->ieee80211->skb_drv_aggQ [i]);
-       }
+       for (i = 0; i < MAX_QUEUE_SIZE; i++)
+               skb_queue_head_init(&priv->ieee80211->skb_waitQ[i]);
+       for (i = 0; i < MAX_QUEUE_SIZE; i++)
+               skb_queue_head_init(&priv->ieee80211->skb_aggQ[i]);
+       for (i = 0; i < MAX_QUEUE_SIZE; i++)
+               skb_queue_head_init(&priv->ieee80211->skb_drv_aggQ[i]);
        priv->rf_set_chan = rtl8192_phy_SwChnl;
 }
 
@@ -2772,7 +2520,6 @@ static void rtl8192_init_priv_lock(struct r8192_priv *priv)
 {
        spin_lock_init(&priv->tx_lock);
        spin_lock_init(&priv->irq_lock);//added by thomas
-       //spin_lock_init(&priv->rf_lock);
        sema_init(&priv->wx_sem, 1);
        sema_init(&priv->rf_sem, 1);
        mutex_init(&priv->mutex);
@@ -2791,20 +2538,16 @@ static void rtl8192_init_priv_task(struct net_device *dev)
 
        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->gpio_change_rf_wq,  dm_gpio_change_rf_callback);
        INIT_DELAYED_WORK(&priv->rfpath_check_wq,  dm_rf_pathcheck_workitemcallback);
        INIT_DELAYED_WORK(&priv->update_beacon_wq, rtl8192_update_beacon);
        INIT_DELAYED_WORK(&priv->initialgain_operate_wq, InitialGainOperateWorkItemCallBack);
-       //INIT_WORK(&priv->SwChnlWorkItem,  rtl8192_SwChnl_WorkItem);
-       //INIT_WORK(&priv->SetBWModeWorkItem,  rtl8192_SetBWModeWorkItem);
        INIT_WORK(&priv->qos_activate, rtl8192_qos_activate);
 
        tasklet_init(&priv->irq_rx_tasklet,
-            (void(*)(unsigned long))rtl8192_irq_rx_tasklet,
-            (unsigned long)priv);
+                    (void(*)(unsigned long))rtl8192_irq_rx_tasklet,
+                    (unsigned long)priv);
 }
 
 static void rtl8192_get_eeprom_size(struct net_device *dev)
@@ -2812,7 +2555,7 @@ static void rtl8192_get_eeprom_size(struct net_device *dev)
        u16 curCR = 0;
        struct r8192_priv *priv = ieee80211_priv(dev);
        RT_TRACE(COMP_EPROM, "===========>%s()\n", __func__);
-       curCR = read_nic_word_E(dev, EPROM_CMD);
+       read_nic_word_E(dev, EPROM_CMD, &curCR);
        RT_TRACE(COMP_EPROM, "read from Reg EPROM_CMD(%x):%x\n", EPROM_CMD, curCR);
        //whether need I consider BIT5?
        priv->epromtype = (curCR & Cmd9346CR_9356SEL) ? EPROM_93c56 : EPROM_93c46;
@@ -2833,19 +2576,18 @@ static void rtl8192_read_eeprom_info(struct net_device *dev)
        u8 bLoad_From_EEPOM = false;
        struct r8192_priv *priv = ieee80211_priv(dev);
        u16 tmpValue = 0;
+       int i;
        RT_TRACE(COMP_EPROM, "===========>%s()\n", __func__);
        wEPROM_ID = eprom_read(dev, 0); //first read EEPROM ID out;
        RT_TRACE(COMP_EPROM, "EEPROM ID is 0x%x\n", wEPROM_ID);
 
-       if (wEPROM_ID != RTL8190_EEPROM_ID)
-       {
+       if (wEPROM_ID != RTL8190_EEPROM_ID) {
                RT_TRACE(COMP_ERR, "EEPROM ID is invalid(is 0x%x(should be 0x%x)\n", wEPROM_ID, RTL8190_EEPROM_ID);
-       }
-       else
+       } else {
                bLoad_From_EEPOM = true;
+       }
 
-       if (bLoad_From_EEPOM)
-       {
+       if (bLoad_From_EEPOM) {
                tmpValue = eprom_read(dev, (EEPROM_VID>>1));
                priv->eeprom_vid = endian_swap(&tmpValue);
                priv->eeprom_pid = eprom_read(dev, (EEPROM_PID>>1));
@@ -2853,9 +2595,7 @@ static void rtl8192_read_eeprom_info(struct net_device *dev)
                priv->eeprom_ChannelPlan = ((tmpValue&0xff00)>>8);
                priv->btxpowerdata_readfromEEPORM = true;
                priv->eeprom_CustomerID = eprom_read(dev, (EEPROM_Customer_ID>>1)) >>8;
-       }
-       else
-       {
+       } else {
                priv->eeprom_vid = 0;
                priv->eeprom_pid = 0;
                priv->card_8192_version = VERSION_819xU_B;
@@ -2865,18 +2605,14 @@ static void rtl8192_read_eeprom_info(struct net_device *dev)
        RT_TRACE(COMP_EPROM, "vid:0x%4x, pid:0x%4x, CustomID:0x%2x, ChanPlan:0x%x\n", priv->eeprom_vid, priv->eeprom_pid, priv->eeprom_CustomerID, priv->eeprom_ChannelPlan);
        //set channelplan from eeprom
        priv->ChannelPlan = priv->eeprom_ChannelPlan;
-       if (bLoad_From_EEPOM)
-       {
+       if (bLoad_From_EEPOM) {
                int i;
-               for (i = 0; i < 6; i += 2)
-               {
+               for (i = 0; i < 6; i += 2) {
                        u16 tmp = 0;
                        tmp = eprom_read(dev, (u16)((EEPROM_NODE_ADDRESS_BYTE_0 + i)>>1));
                        *(u16 *)(&dev->dev_addr[i]) = tmp;
                }
-       }
-       else
-       {
+       } else {
                memcpy(dev->dev_addr, bMac_Tmp_Addr, 6);
                //should I set IDR0 here?
        }
@@ -2884,8 +2620,7 @@ static void rtl8192_read_eeprom_info(struct net_device *dev)
        priv->rf_type = RTL819X_DEFAULT_RF_TYPE; //default 1T2R
        priv->rf_chip = RF_8256;
 
-       if (priv->card_8192_version == (u8)VERSION_819xU_A)
-       {
+       if (priv->card_8192_version == (u8)VERSION_819xU_A) {
                //read Tx power gain offset of legacy OFDM to HT rate
                if (bLoad_From_EEPOM)
                        priv->EEPROMTxPowerDiff = (eprom_read(dev, (EEPROM_TxPowerDiff>>1))&0xff00) >> 8;
@@ -2918,39 +2653,33 @@ static void rtl8192_read_eeprom_info(struct net_device *dev)
                else
                        priv->EEPROM_Def_Ver = 1;
                RT_TRACE(COMP_EPROM, "EEPROM_DEF_VER:%d\n", priv->EEPROM_Def_Ver);
-               if (priv->EEPROM_Def_Ver == 0) //old eeprom definition
-               {
+               if (priv->EEPROM_Def_Ver == 0) { //old eeprom definition
                        int i;
                        if (bLoad_From_EEPOM)
                                priv->EEPROMTxPowerLevelCCK = (eprom_read(dev, (EEPROM_TxPwIndex_CCK>>1))&0xff) >> 8;
                        else
                                priv->EEPROMTxPowerLevelCCK = 0x10;
                        RT_TRACE(COMP_EPROM, "CCK Tx Power Levl: 0x%02x\n", priv->EEPROMTxPowerLevelCCK);
-                       for (i = 0; i < 3; i++)
-                       {
-                               if (bLoad_From_EEPOM)
-                               {
+                       for (i = 0; i < 3; i++) {
+                               if (bLoad_From_EEPOM) {
                                        tmpValue = eprom_read(dev, (EEPROM_TxPwIndex_OFDM_24G+i)>>1);
                                        if (((EEPROM_TxPwIndex_OFDM_24G+i) % 2) == 0)
                                                tmpValue = tmpValue & 0x00ff;
                                        else
                                                tmpValue = (tmpValue & 0xff00) >> 8;
-                               }
-                               else
+                               } else {
                                        tmpValue = 0x10;
+                               }
                                priv->EEPROMTxPowerLevelOFDM24G[i] = (u8) tmpValue;
                                RT_TRACE(COMP_EPROM, "OFDM 2.4G Tx Power Level, Index %d = 0x%02x\n", i, priv->EEPROMTxPowerLevelCCK);
                        }
-               }//end if EEPROM_DEF_VER == 0
-               else if (priv->EEPROM_Def_Ver == 1)
-               {
-                       if (bLoad_From_EEPOM)
-                       {
+               } else if (priv->EEPROM_Def_Ver == 1) {
+                       if (bLoad_From_EEPOM) {
                                tmpValue = eprom_read(dev, (EEPROM_TxPwIndex_CCK_V1>>1));
                                tmpValue = (tmpValue & 0xff00) >> 8;
-                       }
-                       else
+                       } else {
                                tmpValue = 0x10;
+                       }
                        priv->EEPROMTxPowerLevelCCK_V1[0] = (u8)tmpValue;
 
                        if (bLoad_From_EEPOM)
@@ -2972,42 +2701,34 @@ static void rtl8192_read_eeprom_info(struct net_device *dev)
 
                //update HAL variables
                //
-               {
-                       int i;
-                       for (i = 0; i < 14; i++)
-                       {
+               for (i = 0; i < 14; i++) {
+                       if (i <= 3)
+                               priv->TxPowerLevelOFDM24G[i] = priv->EEPROMTxPowerLevelOFDM24G[0];
+                       else if (i >= 4 && i <= 9)
+                               priv->TxPowerLevelOFDM24G[i] = priv->EEPROMTxPowerLevelOFDM24G[1];
+                       else
+                               priv->TxPowerLevelOFDM24G[i] = priv->EEPROMTxPowerLevelOFDM24G[2];
+               }
+
+               for (i = 0; i < 14; i++) {
+                       if (priv->EEPROM_Def_Ver == 0) {
                                if (i <= 3)
-                                       priv->TxPowerLevelOFDM24G[i] = priv->EEPROMTxPowerLevelOFDM24G[0];
+                                       priv->TxPowerLevelCCK[i] = priv->EEPROMTxPowerLevelOFDM24G[0] + (priv->EEPROMTxPowerLevelCCK - priv->EEPROMTxPowerLevelOFDM24G[1]);
                                else if (i >= 4 && i <= 9)
-                                       priv->TxPowerLevelOFDM24G[i] = priv->EEPROMTxPowerLevelOFDM24G[1];
+                                       priv->TxPowerLevelCCK[i] = priv->EEPROMTxPowerLevelCCK;
                                else
-                                       priv->TxPowerLevelOFDM24G[i] = priv->EEPROMTxPowerLevelOFDM24G[2];
-                       }
-
-                       for (i = 0; i < 14; i++)
-                       {
-                               if (priv->EEPROM_Def_Ver == 0)
-                               {
-                                       if (i <= 3)
-                                               priv->TxPowerLevelCCK[i] = priv->EEPROMTxPowerLevelOFDM24G[0] + (priv->EEPROMTxPowerLevelCCK - priv->EEPROMTxPowerLevelOFDM24G[1]);
-                                       else if (i >= 4 && i <= 9)
-                                               priv->TxPowerLevelCCK[i] = priv->EEPROMTxPowerLevelCCK;
-                                       else
-                                               priv->TxPowerLevelCCK[i] = priv->EEPROMTxPowerLevelOFDM24G[2] + (priv->EEPROMTxPowerLevelCCK - priv->EEPROMTxPowerLevelOFDM24G[1]);
-                               }
-                               else if (priv->EEPROM_Def_Ver == 1)
-                               {
-                                       if (i <= 3)
-                                               priv->TxPowerLevelCCK[i] = priv->EEPROMTxPowerLevelCCK_V1[0];
-                                       else if (i >= 4 && i <= 9)
-                                               priv->TxPowerLevelCCK[i] = priv->EEPROMTxPowerLevelCCK_V1[1];
-                                       else
-                                               priv->TxPowerLevelCCK[i] = priv->EEPROMTxPowerLevelCCK_V1[2];
-                               }
+                                       priv->TxPowerLevelCCK[i] = priv->EEPROMTxPowerLevelOFDM24G[2] + (priv->EEPROMTxPowerLevelCCK - priv->EEPROMTxPowerLevelOFDM24G[1]);
+                       } else if (priv->EEPROM_Def_Ver == 1) {
+                               if (i <= 3)
+                                       priv->TxPowerLevelCCK[i] = priv->EEPROMTxPowerLevelCCK_V1[0];
+                               else if (i >= 4 && i <= 9)
+                                       priv->TxPowerLevelCCK[i] = priv->EEPROMTxPowerLevelCCK_V1[1];
+                               else
+                                       priv->TxPowerLevelCCK[i] = priv->EEPROMTxPowerLevelCCK_V1[2];
                        }
-               }//end update HAL variables
+               }
                priv->TxPowerDiff = priv->EEPROMPwDiff;
-// Antenna B gain offset to antenna A, bit0~3
+               // Antenna B gain offset to antenna A, bit0~3
                priv->AntennaTxPwDiff[0] = (priv->EEPROMTxPowerDiff & 0xf);
                // Antenna C gain offset to antenna A, bit4~7
                priv->AntennaTxPwDiff[1] = ((priv->EEPROMTxPowerDiff & 0xf0)>>4);
@@ -3018,46 +2739,41 @@ static void rtl8192_read_eeprom_info(struct net_device *dev)
                priv->ThermalMeter[0] = priv->EEPROMThermalMeter;
        }//end if VersionID == VERSION_819xU_A
 
-//added by vivi, for dlink led, 20080416
-       switch (priv->eeprom_CustomerID)
-       {
-               case EEPROM_CID_RUNTOP:
-                       priv->CustomerID = RT_CID_819x_RUNTOP;
-                       break;
+       //added by vivi, for dlink led, 20080416
+       switch (priv->eeprom_CustomerID) {
+       case EEPROM_CID_RUNTOP:
+               priv->CustomerID = RT_CID_819x_RUNTOP;
+               break;
 
-               case EEPROM_CID_DLINK:
-                       priv->CustomerID = RT_CID_DLINK;
-                       break;
+       case EEPROM_CID_DLINK:
+               priv->CustomerID = RT_CID_DLINK;
+               break;
 
-               default:
-                       priv->CustomerID = RT_CID_DEFAULT;
-                       break;
+       default:
+               priv->CustomerID = RT_CID_DEFAULT;
+               break;
 
        }
 
-       switch (priv->CustomerID)
-       {
-               case RT_CID_819x_RUNTOP:
-                       priv->LedStrategy = SW_LED_MODE2;
-                       break;
+       switch (priv->CustomerID) {
+       case RT_CID_819x_RUNTOP:
+               priv->LedStrategy = SW_LED_MODE2;
+               break;
 
-               case RT_CID_DLINK:
-                       priv->LedStrategy = SW_LED_MODE4;
-                       break;
+       case RT_CID_DLINK:
+               priv->LedStrategy = SW_LED_MODE4;
+               break;
 
-               default:
-                       priv->LedStrategy = SW_LED_MODE0;
-                       break;
+       default:
+               priv->LedStrategy = SW_LED_MODE0;
+               break;
 
        }
 
 
-       if (priv->rf_type == RF_1T2R)
-       {
+       if (priv->rf_type == RF_1T2R) {
                RT_TRACE(COMP_EPROM, "\n1T2R config\n");
-       }
-       else
-       {
+       } else {
                RT_TRACE(COMP_EPROM, "\n2T4R config\n");
        }
 
@@ -3073,8 +2789,8 @@ static void rtl8192_read_eeprom_info(struct net_device *dev)
 short rtl8192_get_channel_map(struct net_device *dev)
 {
        struct r8192_priv *priv = ieee80211_priv(dev);
-       if (priv->ChannelPlan > COUNTRY_CODE_GLOBAL_DOMAIN){
-               printk("rtl8180_init:Error channel plan! Set to default.\n");
+       if (priv->ChannelPlan > COUNTRY_CODE_GLOBAL_DOMAIN) {
+               netdev_err(dev, "rtl8180_init: Error channel plan! Set to default.\n");
                priv->ChannelPlan = 0;
        }
        RT_TRACE(COMP_INIT, "Channel plan is %d\n", priv->ChannelPlan);
@@ -3095,17 +2811,11 @@ short rtl8192_init(struct net_device *dev)
                int i = 0;
                u8 queuetopipe[] = {3, 2, 1, 0, 4, 8, 7, 6, 5};
                memcpy(priv->txqueue_to_outpipemap, queuetopipe, 9);
-/*             for(i=0;i<9;i++)
-                       printk("%d ",priv->txqueue_to_outpipemap[i]);
-               printk("\n");*/
        }
 #else
        {
                u8 queuetopipe[] = {3, 2, 1, 0, 4, 4, 0, 4, 4};
                memcpy(priv->txqueue_to_outpipemap, queuetopipe, 9);
-/*             for(i=0;i<9;i++)
-                       printk("%d ",priv->txqueue_to_outpipemap[i]);
-               printk("\n");*/
        }
 #endif
        rtl8192_init_priv_variable(dev);
@@ -3118,12 +2828,11 @@ short rtl8192_init(struct net_device *dev)
        init_timer(&priv->watch_dog_timer);
        priv->watch_dog_timer.data = (unsigned long)dev;
        priv->watch_dog_timer.function = watch_dog_timer_callback;
-       if (rtl8192_usb_initendpoints(dev) != 0){
+       if (rtl8192_usb_initendpoints(dev) != 0) {
                DMESG("Endopoints initialization failed");
                return -ENOMEM;
        }
 
-       //rtl8192_adapter_start(dev);
 #ifdef DEBUG_EPROM
        dump_eprom(dev);
 #endif
@@ -3143,11 +2852,11 @@ void rtl8192_hwconfig(struct net_device *dev)
        u32 regRATR = 0, regRRSR = 0;
        u8 regBwOpMode = 0, regTmp = 0;
        struct r8192_priv *priv = ieee80211_priv(dev);
+       u32 ratr_value = 0;
 
-// Set RRSR, RATR, and BW_OPMODE registers
+       // Set RRSR, RATR, and BW_OPMODE registers
        //
-       switch (priv->ieee80211->mode)
-       {
+       switch (priv->ieee80211->mode) {
        case WIRELESS_MODE_B:
                regBwOpMode = BW_OPMODE_20MHZ;
                regRATR = RATE_ALL_CCK;
@@ -3165,26 +2874,25 @@ void rtl8192_hwconfig(struct net_device *dev)
                break;
        case WIRELESS_MODE_AUTO:
 #ifdef TO_DO_LIST
-               if (Adapter->bInHctTest)
-               {
-                   regBwOpMode = BW_OPMODE_20MHZ;
-                   regRATR = RATE_ALL_CCK | RATE_ALL_OFDM_AG;
-                   regRRSR = RATE_ALL_CCK | RATE_ALL_OFDM_AG;
+               if (Adapter->bInHctTest) {
+                       regBwOpMode = BW_OPMODE_20MHZ;
+                       regRATR = RATE_ALL_CCK | RATE_ALL_OFDM_AG;
+                       regRRSR = RATE_ALL_CCK | RATE_ALL_OFDM_AG;
                }
                else
 #endif
                {
-                   regBwOpMode = BW_OPMODE_20MHZ;
-                   regRATR = RATE_ALL_CCK | RATE_ALL_OFDM_AG | RATE_ALL_OFDM_1SS | RATE_ALL_OFDM_2SS;
-                   regRRSR = RATE_ALL_CCK | RATE_ALL_OFDM_AG;
+                       regBwOpMode = BW_OPMODE_20MHZ;
+                       regRATR = RATE_ALL_CCK | RATE_ALL_OFDM_AG | RATE_ALL_OFDM_1SS | RATE_ALL_OFDM_2SS;
+                       regRRSR = RATE_ALL_CCK | RATE_ALL_OFDM_AG;
                }
                break;
        case WIRELESS_MODE_N_24G:
                // It support CCK rate by default.
                // CCK rate will be filtered out only when associated AP does not support it.
                regBwOpMode = BW_OPMODE_20MHZ;
-                       regRATR = RATE_ALL_CCK | RATE_ALL_OFDM_AG | RATE_ALL_OFDM_1SS | RATE_ALL_OFDM_2SS;
-                       regRRSR = RATE_ALL_CCK | RATE_ALL_OFDM_AG;
+               regRATR = RATE_ALL_CCK | RATE_ALL_OFDM_AG | RATE_ALL_OFDM_1SS | RATE_ALL_OFDM_2SS;
+               regRRSR = RATE_ALL_CCK | RATE_ALL_OFDM_AG;
                break;
        case WIRELESS_MODE_N_5G:
                regBwOpMode = BW_OPMODE_5G;
@@ -3194,17 +2902,12 @@ void rtl8192_hwconfig(struct net_device *dev)
        }
 
        write_nic_byte(dev, BW_OPMODE, regBwOpMode);
-       {
-               u32 ratr_value = 0;
-               ratr_value = regRATR;
-               if (priv->rf_type == RF_1T2R)
-               {
-                       ratr_value &= ~(RATE_ALL_OFDM_2SS);
-               }
-               write_nic_dword(dev, RATR0, ratr_value);
-               write_nic_byte(dev, UFWP, 1);
-       }
-       regTmp = read_nic_byte(dev, 0x313);
+       ratr_value = regRATR;
+       if (priv->rf_type == RF_1T2R)
+               ratr_value &= ~(RATE_ALL_OFDM_2SS);
+       write_nic_dword(dev, RATR0, ratr_value);
+       write_nic_byte(dev, UFWP, 1);
+       read_nic_byte(dev, 0x313, &regTmp);
        regRRSR = ((regTmp) << 24) | (regRRSR & 0x00ffffff);
        write_nic_dword(dev, RRSR, regRRSR);
 
@@ -3212,8 +2915,8 @@ void rtl8192_hwconfig(struct net_device *dev)
        // Set Retry Limit here
        //
        write_nic_word(dev, RETRY_LIMIT,
-                       priv->ShortRetryLimit << RETRY_LIMIT_SHORT_SHIFT | \
-                       priv->LongRetryLimit << RETRY_LIMIT_LONG_SHIFT);
+                      priv->ShortRetryLimit << RETRY_LIMIT_SHORT_SHIFT |
+                      priv->LongRetryLimit << RETRY_LIMIT_LONG_SHIFT);
        // Set Contention Window here
 
        // Set Tx AGC
@@ -3232,6 +2935,8 @@ bool rtl8192_adapter_start(struct net_device *dev)
        struct r8192_priv *priv = ieee80211_priv(dev);
        u32 dwRegRead = 0;
        bool init_status = true;
+       u8 SECR_value = 0x0;
+       u8 tmp;
        RT_TRACE(COMP_INIT, "====>%s()\n", __func__);
        priv->Rf_Mode = RF_OP_By_SW_3wire;
        //for ASIC power on sequence
@@ -3242,11 +2947,10 @@ bool rtl8192_adapter_start(struct net_device *dev)
        write_nic_byte_E(dev, 0x5e, 0x80);
        write_nic_byte(dev, 0x17, 0x37);
        mdelay(10);
-//#ifdef TO_DO_LIST
        priv->pFirmware->firmware_status = FW_STATUS_0_INIT;
        //config CPUReset Register
        //Firmware Reset or not?
-       dwRegRead = read_nic_dword(dev, CPU_GEN);
+       read_nic_dword(dev, CPU_GEN, &dwRegRead);
        if (priv->pFirmware->firmware_status == FW_STATUS_0_INIT)
                dwRegRead |= CPU_GEN_SYSTEM_RESET; //do nothing here?
        else if (priv->pFirmware->firmware_status == FW_STATUS_5_READY)
@@ -3255,15 +2959,13 @@ bool rtl8192_adapter_start(struct net_device *dev)
                RT_TRACE(COMP_ERR, "ERROR in %s(): undefined firmware state(%d)\n", __func__,   priv->pFirmware->firmware_status);
 
        write_nic_dword(dev, CPU_GEN, dwRegRead);
-       //mdelay(30);
        //config BB.
        rtl8192_BBConfig(dev);
 
        //Loopback mode or not
        priv->LoopbackMode = RTL819xU_NO_LOOPBACK;
-//     priv->LoopbackMode = RTL819xU_MAC_LOOPBACK;
 
-       dwRegRead = read_nic_dword(dev, CPU_GEN);
+       read_nic_dword(dev, CPU_GEN, &dwRegRead);
        if (priv->LoopbackMode == RTL819xU_NO_LOOPBACK)
                dwRegRead = ((dwRegRead & CPU_GEN_NO_LOOPBACK_MSK) | CPU_GEN_NO_LOOPBACK_SET);
        else if (priv->LoopbackMode == RTL819xU_MAC_LOOPBACK)
@@ -3277,7 +2979,8 @@ bool rtl8192_adapter_start(struct net_device *dev)
        udelay(500);
 
        //xiong add for new bitfile:usb suspend reset pin set to 1. //do we need?
-       write_nic_byte_E(dev, 0x5f, (read_nic_byte_E(dev, 0x5f)|0x20));
+       read_nic_byte_E(dev, 0x5f, &tmp);
+       write_nic_byte_E(dev, 0x5f, tmp|0x20);
 
        //Set Hardware
        rtl8192_hwconfig(dev);
@@ -3293,54 +2996,47 @@ bool rtl8192_adapter_start(struct net_device *dev)
        write_nic_dword(dev, RCR, priv->ReceiveConfig);
 
        //Initialize Number of Reserved Pages in Firmware Queue
-       write_nic_dword(dev, 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 |\
-                                               NUM_OF_PAGE_IN_FW_QUEUE_CMD << RSVD_FW_QUEUE_PAGE_CMD_SHIFT);
-       write_nic_dword(dev, 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
-                                               );
+       write_nic_dword(dev, 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 |
+                       NUM_OF_PAGE_IN_FW_QUEUE_CMD << RSVD_FW_QUEUE_PAGE_CMD_SHIFT);
+       write_nic_dword(dev, RQPN3, APPLIED_RESERVED_QUEUE_IN_FW|
+                       NUM_OF_PAGE_IN_FW_QUEUE_BCN<<RSVD_FW_QUEUE_PAGE_BCN_SHIFT);
        write_nic_dword(dev, RATR0+4*7, (RATE_ALL_OFDM_AG | RATE_ALL_CCK));
 
        //Set 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);
 
-//     RT_TRACE(COMP_INIT, "%s():priv->ResetProgress is %d\n", __FUNCTION__,priv->ResetProgress);
        if (priv->ResetProgress == RESET_TYPE_NORESET)
-       rtl8192_SetWirelessMode(dev, priv->ieee80211->mode);
-       if (priv->ResetProgress == RESET_TYPE_NORESET){
-       CamResetAllEntry(dev);
-       {
-               u8 SECR_value = 0x0;
+               rtl8192_SetWirelessMode(dev, priv->ieee80211->mode);
+       if (priv->ResetProgress == RESET_TYPE_NORESET) {
+               CamResetAllEntry(dev);
                SECR_value |= SCR_TxEncEnable;
                SECR_value |= SCR_RxDecEnable;
                SECR_value |= SCR_NoSKMC;
                write_nic_byte(dev, SECR, SECR_value);
        }
-       }
 
        //Beacon related
        write_nic_word(dev, ATIMWND, 2);
        write_nic_word(dev, BCN_INTERVAL, 100);
 
-       {
 #define DEFAULT_EDCA 0x005e4332
+       {
                int i;
                for (i = 0; i < QOS_QUEUE_NUM; i++)
-               write_nic_dword(dev, WDCAPARA_ADD[i], DEFAULT_EDCA);
+                       write_nic_dword(dev, WDCAPARA_ADD[i], DEFAULT_EDCA);
        }
 #ifdef USB_RX_AGGREGATION_SUPPORT
        //3 For usb rx firmware aggregation control
-       if (priv->ResetProgress == RESET_TYPE_NORESET)
-       {
+       if (priv->ResetProgress == RESET_TYPE_NORESET) {
                u32 ulValue;
                PRT_HIGH_THROUGHPUT     pHTInfo = priv->ieee80211->pHTInfo;
                ulValue = (pHTInfo->UsbRxFwAggrEn<<24) | (pHTInfo->UsbRxFwAggrPageNum<<16) |
-                                       (pHTInfo->UsbRxFwAggrPacketNum<<8) | (pHTInfo->UsbRxFwAggrTimeout);
+                         (pHTInfo->UsbRxFwAggrPacketNum<<8) | (pHTInfo->UsbRxFwAggrTimeout);
                /*
                 * If usb rx firmware aggregation is enabled,
                 * when anyone of three threshold conditions above is reached,
@@ -3353,48 +3049,37 @@ bool rtl8192_adapter_start(struct net_device *dev)
 
        rtl8192_phy_configmac(dev);
 
-       if (priv->card_8192_version == (u8) VERSION_819xU_A)
-       {
+       if (priv->card_8192_version == (u8) VERSION_819xU_A) {
                rtl8192_phy_getTxPower(dev);
                rtl8192_phy_setTxPower(dev, priv->chan);
        }
 
        //Firmware download
        init_status = init_firmware(dev);
-       if (!init_status)
-       {
+       if (!init_status) {
                RT_TRACE(COMP_ERR, "ERR!!! %s(): Firmware download is failed\n", __func__);
                return init_status;
        }
        RT_TRACE(COMP_INIT, "%s():after firmware download\n", __func__);
        //
 #ifdef TO_DO_LIST
-if (Adapter->ResetProgress == RESET_TYPE_NORESET)
-       {
-               if (pMgntInfo->RegRfOff == TRUE)
-               { // User disable RF via registry.
+       if (Adapter->ResetProgress == RESET_TYPE_NORESET) {
+               if (pMgntInfo->RegRfOff == TRUE) { // User disable RF via registry.
                        RT_TRACE((COMP_INIT|COMP_RF), DBG_LOUD, ("InitializeAdapter819xUsb(): Turn off RF for RegRfOff ----------\n"));
                        MgntActSet_RF_State(Adapter, eRfOff, RF_CHANGE_BY_SW);
                        // Those actions will be discard in MgntActSet_RF_State because of the same state
                        for (eRFPath = 0; eRFPath < pHalData->NumTotalRFPath; eRFPath++)
                                PHY_SetRFReg(Adapter, (RF90_RADIO_PATH_E)eRFPath, 0x4, 0xC00, 0x0);
-               }
-               else if (pMgntInfo->RfOffReason > RF_CHANGE_BY_PS)
-               { // H/W or S/W RF OFF before sleep.
+               } else if (pMgntInfo->RfOffReason > RF_CHANGE_BY_PS) { // H/W or S/W RF OFF before sleep.
                        RT_TRACE((COMP_INIT|COMP_RF), DBG_LOUD, ("InitializeAdapter819xUsb(): Turn off RF for RfOffReason(%d) ----------\n", pMgntInfo->RfOffReason));
                        MgntActSet_RF_State(Adapter, eRfOff, pMgntInfo->RfOffReason);
-               }
-               else
-               {
+               } else {
                        pHalData->eRFPowerState = eRfOn;
                        pMgntInfo->RfOffReason = 0;
                        RT_TRACE((COMP_INIT|COMP_RF), DBG_LOUD, ("InitializeAdapter819xUsb(): RF is on ----------\n"));
                }
-       }
-       else
-       {
-               if (pHalData->eRFPowerState == eRfOff)
-               {
+       } else {
+               if (pHalData->eRFPowerState == eRfOff) {
                        MgntActSet_RF_State(Adapter, eRfOff, pMgntInfo->RfOffReason);
                        // Those actions will be discard in MgntActSet_RF_State because of the same state
                        for (eRFPath = 0; eRFPath < pHalData->NumTotalRFPath; eRFPath++)
@@ -3403,9 +3088,9 @@ if (Adapter->ResetProgress == RESET_TYPE_NORESET)
        }
 #endif
        //config RF.
-       if (priv->ResetProgress == RESET_TYPE_NORESET){
-       rtl8192_phy_RFConfig(dev);
-       RT_TRACE(COMP_INIT, "%s():after phy RF config\n", __func__);
+       if (priv->ResetProgress == RESET_TYPE_NORESET) {
+               rtl8192_phy_RFConfig(dev);
+               RT_TRACE(COMP_INIT, "%s():after phy RF config\n", __func__);
        }
 
 
@@ -3421,31 +3106,24 @@ if (Adapter->ResetProgress == RESET_TYPE_NORESET)
        rtl8192_setBBreg(dev, rFPGA0_RFMOD, bCCKEn, 0x1);
        rtl8192_setBBreg(dev, rFPGA0_RFMOD, bOFDMEn, 0x1);
 
-       if (priv->ResetProgress == RESET_TYPE_NORESET)
-       {
+       if (priv->ResetProgress == RESET_TYPE_NORESET) {
                //if D or C cut
-               u8 tmpvalue = read_nic_byte(dev, 0x301);
-               if (tmpvalue == 0x03)
-               {
+               u8 tmpvalue;
+               read_nic_byte(dev, 0x301, &tmpvalue);
+               if (tmpvalue == 0x03) {
                        priv->bDcut = TRUE;
                        RT_TRACE(COMP_POWER_TRACKING, "D-cut\n");
-               }
-               else
-               {
+               } else {
                        priv->bDcut = FALSE;
                        RT_TRACE(COMP_POWER_TRACKING, "C-cut\n");
                }
                dm_initialize_txpower_tracking(dev);
 
-               if (priv->bDcut == TRUE)
-               {
+               if (priv->bDcut == TRUE) {
                        u32 i, TempCCk;
                        u32 tmpRegA = rtl8192_QueryBBReg(dev, rOFDM0_XATxIQImbalance, bMaskDWord);
-               //      u32 tmpRegC= rtl8192_QueryBBReg(dev,rOFDM0_XCTxIQImbalance,bMaskDWord);
-                       for (i = 0; i < TxBBGainTableLength; i++)
-                       {
-                               if (tmpRegA == priv->txbbgain_table[i].txbbgain_value)
-                               {
+                       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;
@@ -3455,11 +3133,9 @@ if (Adapter->ResetProgress == RESET_TYPE_NORESET)
 
                        TempCCk = rtl8192_QueryBBReg(dev, rCCK0_TxFilter1, bMaskByte2);
 
-                       for (i = 0; i < CCKTxBBGainTableLength; i++)
-                       {
+                       for (i = 0; i < CCKTxBBGainTableLength; i++) {
 
-                               if (TempCCk == priv->cck_txbbgain_table[i].ccktxbb_valuearray[0])
-                               {
+                               if (TempCCk == priv->cck_txbbgain_table[i].ccktxbb_valuearray[0]) {
                                        priv->cck_present_attentuation_20Mdefault = (u8) i;
                                        break;
                                }
@@ -3468,7 +3144,6 @@ if (Adapter->ResetProgress == RESET_TYPE_NORESET)
                        priv->cck_present_attentuation_difference = 0;
                        priv->cck_present_attentuation = priv->cck_present_attentuation_20Mdefault;
 
-       //              pMgntInfo->bTXPowerTracking = FALSE;//TEMPLY DISABLE
                }
        }
        write_nic_byte(dev, 0x87, 0x0);
@@ -3492,14 +3167,12 @@ static struct net_device_stats *rtl8192_stats(struct net_device *dev)
        return &priv->ieee80211->stats;
 }
 
-bool
-HalTxCheckStuck819xUsb(
-       struct net_device *dev
-       )
+bool HalTxCheckStuck819xUsb(struct net_device *dev)
 {
        struct r8192_priv *priv = ieee80211_priv(dev);
-       u16             RegTxCounter = read_nic_word(dev, 0x128);
+       u16             RegTxCounter;
        bool            bStuck = FALSE;
+       read_nic_word(dev, 0x128, &RegTxCounter);
        RT_TRACE(COMP_RESET, "%s():RegTxCounter is %d,TxCounter is %d\n", __func__, RegTxCounter, priv->TxCounter);
        if (priv->TxCounter == RegTxCounter)
                bStuck = TRUE;
@@ -3513,43 +3186,30 @@ HalTxCheckStuck819xUsb(
 *      <Assumption: RT_TX_SPINLOCK is acquired.>
 *      First added: 2006.11.19 by emily
 */
-RESET_TYPE
-TxCheckStuck(struct net_device *dev)
+RESET_TYPE TxCheckStuck(struct net_device *dev)
 {
        struct r8192_priv *priv = ieee80211_priv(dev);
        u8                      QueueID;
-//     PRT_TCB                 pTcb;
-//     u8                      ResetThreshold;
        bool                    bCheckFwTxCnt = false;
-       //unsigned long flags;
 
        //
        // Decide such threshold according to current power save mode
        //
 
-//     RT_TRACE(COMP_RESET, " ==> TxCheckStuck()\n");
-//          PlatformAcquireSpinLock(Adapter, RT_TX_SPINLOCK);
-//          spin_lock_irqsave(&priv->ieee80211->lock,flags);
-            for (QueueID = 0; QueueID <= BEACON_QUEUE; QueueID ++)
-            {
-                       if (QueueID == TXCMD_QUEUE)
-                        continue;
+       for (QueueID = 0; QueueID <= BEACON_QUEUE; QueueID++) {
+               if (QueueID == TXCMD_QUEUE)
+                       continue;
 #ifdef USB_TX_DRIVER_AGGREGATION_ENABLE
-                       if ((skb_queue_len(&priv->ieee80211->skb_waitQ[QueueID]) == 0) && (skb_queue_len(&priv->ieee80211->skb_aggQ[QueueID]) == 0) && (skb_queue_len(&priv->ieee80211->skb_drv_aggQ[QueueID]) == 0))
+               if ((skb_queue_len(&priv->ieee80211->skb_waitQ[QueueID]) == 0) && (skb_queue_len(&priv->ieee80211->skb_aggQ[QueueID]) == 0) && (skb_queue_len(&priv->ieee80211->skb_drv_aggQ[QueueID]) == 0))
 #else
-                       if ((skb_queue_len(&priv->ieee80211->skb_waitQ[QueueID]) == 0)  && (skb_queue_len(&priv->ieee80211->skb_aggQ[QueueID]) == 0))
+               if ((skb_queue_len(&priv->ieee80211->skb_waitQ[QueueID]) == 0)  && (skb_queue_len(&priv->ieee80211->skb_aggQ[QueueID]) == 0))
 #endif
                                continue;
 
-                    bCheckFwTxCnt = true;
-            }
-//          PlatformReleaseSpinLock(Adapter, RT_TX_SPINLOCK);
-//     spin_unlock_irqrestore(&priv->ieee80211->lock,flags);
-//     RT_TRACE(COMP_RESET,"bCheckFwTxCnt is %d\n",bCheckFwTxCnt);
-       if (bCheckFwTxCnt)
-       {
-               if (HalTxCheckStuck819xUsb(dev))
-               {
+               bCheckFwTxCnt = true;
+       }
+       if (bCheckFwTxCnt) {
+               if (HalTxCheckStuck819xUsb(dev)) {
                        RT_TRACE(COMP_RESET, "TxCheckStuck(): Fw indicates no Tx condition! \n");
                        return RESET_TYPE_SILENT;
                }
@@ -3557,61 +3217,38 @@ TxCheckStuck(struct net_device *dev)
        return RESET_TYPE_NORESET;
 }
 
-bool
-HalRxCheckStuck819xUsb(struct net_device *dev)
+bool HalRxCheckStuck819xUsb(struct net_device *dev)
 {
-       u16     RegRxCounter = read_nic_word(dev, 0x130);
+       u16     RegRxCounter;
        struct r8192_priv *priv = ieee80211_priv(dev);
        bool bStuck = FALSE;
        static u8       rx_chk_cnt;
+       read_nic_word(dev, 0x130, &RegRxCounter);
        RT_TRACE(COMP_RESET, "%s(): RegRxCounter is %d,RxCounter is %d\n", __func__, 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))
-       {
+       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)))
-       {
+       } 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)
-               {
                        return bStuck;
-               }
                else
-               {
                        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)
-       {
+       } 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)
-               {
-                       //DbgPrint("RSSI < %d && RSSI >= %d, no check this time \n", RateAdaptiveTH_Low, VeryLowRSSI);
                        return bStuck;
-               }
                else
-               {
                        rx_chk_cnt = 0;
-                       //DbgPrint("RSSI < %d && RSSI >= %d, check this time \n", RateAdaptiveTH_Low, VeryLowRSSI);
-               }
-       }
-       else
-       {
+       } else {
                if (rx_chk_cnt < 8)
-               {
-                       //DbgPrint("RSSI <= %d, no check this time \n", VeryLowRSSI);
                        return bStuck;
-               }
                else
-               {
                        rx_chk_cnt = 0;
-                       //DbgPrint("RSSI <= %d, check this time \n", VeryLowRSSI);
-               }
        }
 
        if (priv->RxCounter == RegRxCounter)
@@ -3622,25 +3259,16 @@ HalRxCheckStuck819xUsb(struct net_device *dev)
        return bStuck;
 }
 
-RESET_TYPE
-RxCheckStuck(struct net_device *dev)
+RESET_TYPE RxCheckStuck(struct net_device *dev)
 {
        struct r8192_priv *priv = ieee80211_priv(dev);
-       //int                     i;
        bool        bRxCheck = FALSE;
 
-//       RT_TRACE(COMP_RESET," ==> RxCheckStuck()\n");
-       //PlatformAcquireSpinLock(Adapter, RT_RX_SPINLOCK);
-
-        if (priv->IrpPendingCount > 1)
+       if (priv->IrpPendingCount > 1)
                bRxCheck = TRUE;
-       //PlatformReleaseSpinLock(Adapter, RT_RX_SPINLOCK);
 
-//       RT_TRACE(COMP_RESET,"bRxCheck is %d \n",bRxCheck);
-       if (bRxCheck)
-       {
-               if (HalRxCheckStuck819xUsb(dev))
-               {
+       if (bRxCheck) {
+               if (HalRxCheckStuck819xUsb(dev)) {
                        RT_TRACE(COMP_RESET, "RxStuck Condition\n");
                        return RESET_TYPE_SILENT;
                }
@@ -3661,8 +3289,7 @@ RxCheckStuck(struct net_device *dev)
 *
 *      8185 and 8185b does not implement this function. This is added by Emily at 2006.11.24
 */
-RESET_TYPE
-rtl819x_ifcheck_resetornot(struct net_device *dev)
+RESET_TYPE rtl819x_ifcheck_resetornot(struct net_device *dev)
 {
        struct r8192_priv *priv = ieee80211_priv(dev);
        RESET_TYPE      TxResetType = RESET_TYPE_NORESET;
@@ -3673,9 +3300,7 @@ rtl819x_ifcheck_resetornot(struct net_device *dev)
 
        TxResetType = TxCheckStuck(dev);
        if (rfState != eRfOff ||
-               /*ADAPTER_TEST_STATUS_FLAG(Adapter, ADAPTER_STATUS_FW_DOWNLOAD_FAILURE)) &&*/
-               (priv->ieee80211->iw_mode != IW_MODE_ADHOC))
-       {
+           (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
@@ -3686,14 +3311,14 @@ rtl819x_ifcheck_resetornot(struct net_device *dev)
                // set, STA cannot hear any packet at all. Emily, 2008.04.12
                RxResetType = RxCheckStuck(dev);
        }
-       if (TxResetType == RESET_TYPE_NORMAL || RxResetType == RESET_TYPE_NORMAL)
+       if (TxResetType == RESET_TYPE_NORMAL || RxResetType == RESET_TYPE_NORMAL) {
                return RESET_TYPE_NORMAL;
-       else if (TxResetType == RESET_TYPE_SILENT || RxResetType == RESET_TYPE_SILENT){
+       } else if (TxResetType == RESET_TYPE_SILENT || RxResetType == RESET_TYPE_SILENT) {
                RT_TRACE(COMP_RESET, "%s():silent reset\n", __func__);
                return RESET_TYPE_SILENT;
-       }
-       else
+       } else {
                return RESET_TYPE_NORESET;
+       }
 
 }
 
@@ -3703,8 +3328,7 @@ int rtl8192_close(struct net_device *dev);
 
 
 
-void
-CamRestoreAllEntry(struct net_device *dev)
+void CamRestoreAllEntry(struct net_device *dev)
 {
        u8 EntryId = 0;
        struct r8192_priv *priv = ieee80211_priv(dev);
@@ -3715,126 +3339,63 @@ CamRestoreAllEntry(struct net_device *dev)
                {0x00, 0x00, 0x00, 0x00, 0x00, 0x01},
                {0x00, 0x00, 0x00, 0x00, 0x00, 0x02},
                {0x00, 0x00, 0x00, 0x00, 0x00, 0x03} };
-       static u8       CAM_CONST_BROAD[] =
-               {0xff, 0xff, 0xff, 0xff, 0xff, 0xff};
+       static 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))
-       {
+       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);
-                       }
+               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)
-       {
+       } 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);
+       } 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->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)
-       {
+       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);
-                       }
+               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)
-       {
+                       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);
-                       }
+               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);
+                       setKey(dev, 0, 0, priv->ieee80211->group_key_type,
+                              CAM_CONST_ADDR[0], 0, NULL);
        }
 }
 //////////////////////////////////////////////////////////////
@@ -3843,10 +3404,8 @@ CamRestoreAllEntry(struct net_device *dev)
 // The method checking Tx/Rx stuck of this function is supported by FW,
 // which reports Tx and Rx counter to register 0x128 and 0x130.
 //////////////////////////////////////////////////////////////
-void
-rtl819x_ifsilentreset(struct net_device *dev)
+void rtl819x_ifsilentreset(struct net_device *dev)
 {
-       //OCTET_STRING asocpdu;
        struct r8192_priv *priv = ieee80211_priv(dev);
        u8      reset_times = 0;
        int reset_status = 0;
@@ -3856,26 +3415,21 @@ rtl819x_ifsilentreset(struct net_device *dev)
        // 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)
-       {
+       if (priv->ResetProgress == RESET_TYPE_NORESET) {
 RESET_START:
 
                RT_TRACE(COMP_RESET, "=========>Reset progress!! \n");
 
                // Set the variable for reset.
                priv->ResetProgress = RESET_TYPE_SILENT;
-//             rtl8192_close(dev);
                down(&priv->wx_sem);
-               if (priv->up == 0)
-               {
+               if (priv->up == 0) {
                        RT_TRACE(COMP_ERR, "%s():the driver is not up! return\n", __func__);
                        up(&priv->wx_sem);
                        return;
                }
                priv->up = 0;
                RT_TRACE(COMP_RESET, "%s():======>start to down the driver\n", __func__);
-//             if(!netif_queue_stopped(dev))
-//                     netif_stop_queue(dev);
 
                rtl8192_rtx_disable(dev);
                rtl8192_cancel_deferred_work(priv);
@@ -3883,55 +3437,44 @@ RESET_START:
                del_timer_sync(&priv->watch_dog_timer);
 
                ieee->sync_scan_hurryup = 1;
-               if (ieee->state == IEEE80211_LINKED)
-               {
+               if (ieee->state == IEEE80211_LINKED) {
                        down(&ieee->wx_sem);
-                       printk("ieee->state is IEEE80211_LINKED\n");
+                       netdev_dbg(dev, "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);
                        netif_carrier_off(dev);
                        up(&ieee->wx_sem);
+               } else {
+                       netdev_dbg(dev, "ieee->state is NOT LINKED\n");
+                       ieee80211_softmac_stop_protocol(priv->ieee80211);
                }
-               else{
-                       printk("ieee->state is NOT LINKED\n");
-                       ieee80211_softmac_stop_protocol(priv->ieee80211);                       }
                up(&priv->wx_sem);
                RT_TRACE(COMP_RESET, "%s():<==========down process is finished\n", __func__);
-       //rtl8192_irq_disable(dev);
                RT_TRACE(COMP_RESET, "%s():===========>start up the driver\n", __func__);
                reset_status = _rtl8192_up(dev);
 
                RT_TRACE(COMP_RESET, "%s():<===========up process is finished\n", __func__);
-               if (reset_status == -EAGAIN)
-               {
-                       if (reset_times < 3)
-                       {
+               if (reset_status == -EAGAIN) {
+                       if (reset_times < 3) {
                                reset_times++;
                                goto RESET_START;
-                       }
-                       else
-                       {
+                       } else {
                                RT_TRACE(COMP_ERR, " ERR!!! %s():  Reset Failed!!\n", __func__);
                        }
                }
                ieee->is_silent_reset = 1;
                EnableHWSecurityConfig8192(dev);
-               if (ieee->state == IEEE80211_LINKED && ieee->iw_mode == IW_MODE_INFRA)
-               {
+               if (ieee->state == IEEE80211_LINKED && ieee->iw_mode == IW_MODE_INFRA) {
                        ieee->set_chan(ieee->dev, ieee->current_network.channel);
 
                        queue_work(ieee->wq, &ieee->associate_complete_wq);
 
-               }
-               else if (ieee->state == IEEE80211_LINKED && ieee->iw_mode == IW_MODE_ADHOC)
-               {
+               } 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)
@@ -3953,50 +3496,36 @@ RESET_START:
        }
 }
 
-void CAM_read_entry(
-       struct net_device *dev,
-       u32                     iIndex
-)
+void CAM_read_entry(struct net_device *dev, u32 iIndex)
 {
        u32 target_command = 0;
-        u32 target_content = 0;
-        u8 entry_i = 0;
-        u32 ulStatus;
+       u32 target_content = 0;
+       u8 entry_i = 0;
+       u32 ulStatus;
        s32 i = 100;
-//     printk("=======>start read CAM\n");
-       for (entry_i = 0; entry_i < CAM_CONTENT_COUNT; entry_i++)
-       {
-       // polling bit, and No Write enable, and address
+       for (entry_i = 0; entry_i < CAM_CONTENT_COUNT; entry_i++) {
+               // polling bit, and No Write enable, and address
                target_command = entry_i+CAM_CONTENT_COUNT*iIndex;
                target_command = target_command | BIT31;
 
-       //Check polling bit is clear
-//     mdelay(1);
-               while ((i--) >= 0)
-               {
-                       ulStatus = read_nic_dword(dev, RWCAM);
-                       if (ulStatus & BIT31){
+               //Check polling bit is clear
+               while ((i--) >= 0) {
+                       read_nic_dword(dev, RWCAM, &ulStatus);
+                       if (ulStatus & BIT31)
                                continue;
-                       }
-                       else{
+                       else
                                break;
-                       }
                }
                write_nic_dword(dev, RWCAM, target_command);
                RT_TRACE(COMP_SEC, "CAM_read_entry(): WRITE A0: %x \n", target_command);
-        //     printk("CAM_read_entry(): WRITE A0: %lx \n",target_command);
-               target_content = read_nic_dword(dev, RCAMO);
+               read_nic_dword(dev, RCAMO, &target_content);
                RT_TRACE(COMP_SEC, "CAM_read_entry(): WRITE A8: %x \n", target_content);
-        //     printk("CAM_read_entry(): WRITE A8: %lx \n",target_content);
        }
        printk("\n");
 }
 
-void rtl819x_update_rxcounts(
-       struct r8192_priv *priv,
-       u32 *TotalRxBcnNum,
-       u32 *TotalRxDataNum
-)
+void rtl819x_update_rxcounts(struct r8192_priv *priv, u32 *TotalRxBcnNum,
+                            u32 *TotalRxDataNum)
 {
        u16                     SlotIndex;
        u8                      i;
@@ -4007,79 +3536,67 @@ void rtl819x_update_rxcounts(
        SlotIndex = (priv->ieee80211->LinkDetectInfo.SlotIndex++)%(priv->ieee80211->LinkDetectInfo.SlotNum);
        priv->ieee80211->LinkDetectInfo.RxBcnNum[SlotIndex] = priv->ieee80211->LinkDetectInfo.NumRecvBcnInPeriod;
        priv->ieee80211->LinkDetectInfo.RxDataNum[SlotIndex] = priv->ieee80211->LinkDetectInfo.NumRecvDataInPeriod;
-       for (i = 0; i < priv->ieee80211->LinkDetectInfo.SlotNum; i++){
+       for (i = 0; i < priv->ieee80211->LinkDetectInfo.SlotNum; i++) {
                *TotalRxBcnNum += priv->ieee80211->LinkDetectInfo.RxBcnNum[i];
                *TotalRxDataNum += priv->ieee80211->LinkDetectInfo.RxDataNum[i];
        }
 }
 
 
-extern void    rtl819x_watchdog_wqcallback(struct work_struct *work)
+extern 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 r8192_priv *priv = container_of(dwork, struct r8192_priv, watch_dog_wq);
+       struct net_device *dev = priv->ieee80211->dev;
        struct ieee80211_device *ieee = priv->ieee80211;
        RESET_TYPE      ResetType = RESET_TYPE_NORESET;
        static u8       check_reset_cnt;
        bool bBusyTraffic = false;
+       u32     TotalRxBcnNum = 0;
+       u32     TotalRxDataNum = 0;
 
        if (!priv->up)
                return;
        hal_dm_watchdog(dev);
 
-       {//to get busy traffic condition
-               if (ieee->state == IEEE80211_LINKED)
-               {
-                       if (ieee->LinkDetectInfo.NumRxOkInPeriod > 666 ||
-                           ieee->LinkDetectInfo.NumTxOkInPeriod > 666 ) {
-                               bBusyTraffic = true;
-                       }
-                       ieee->LinkDetectInfo.NumRxOkInPeriod = 0;
-                       ieee->LinkDetectInfo.NumTxOkInPeriod = 0;
-                       ieee->LinkDetectInfo.bBusyTraffic = bBusyTraffic;
+       //to get busy traffic condition
+       if (ieee->state == IEEE80211_LINKED) {
+               if (ieee->LinkDetectInfo.NumRxOkInPeriod > 666 ||
+                   ieee->LinkDetectInfo.NumTxOkInPeriod > 666 ) {
+                       bBusyTraffic = true;
                }
+               ieee->LinkDetectInfo.NumRxOkInPeriod = 0;
+               ieee->LinkDetectInfo.NumTxOkInPeriod = 0;
+               ieee->LinkDetectInfo.bBusyTraffic = bBusyTraffic;
        }
        //added by amy for AP roaming
-       {
-               if (priv->ieee80211->state == IEEE80211_LINKED && priv->ieee80211->iw_mode == IW_MODE_INFRA)
-               {
-                       u32     TotalRxBcnNum = 0;
-                       u32     TotalRxDataNum = 0;
+       if (priv->ieee80211->state == IEEE80211_LINKED && priv->ieee80211->iw_mode == IW_MODE_INFRA) {
 
-                       rtl819x_update_rxcounts(priv, &TotalRxBcnNum, &TotalRxDataNum);
-                       if ((TotalRxBcnNum+TotalRxDataNum) == 0)
-                       {
-                               #ifdef TODO
-                               if (rfState == eRfOff)
-                                       RT_TRACE(COMP_ERR, "========>%s()\n", __func__);
-                               #endif
-                               printk("===>%s(): AP is power off,connect another one\n", __func__);
-                       //      Dot11d_Reset(dev);
-                               priv->ieee80211->state = IEEE80211_ASSOCIATING;
-                               notify_wx_assoc_event(priv->ieee80211);
-                               RemovePeerTS(priv->ieee80211, priv->ieee80211->current_network.bssid);
-                               priv->ieee80211->link_change(dev);
-                               queue_work(priv->ieee80211->wq, &priv->ieee80211->associate_procedure_wq);
+               rtl819x_update_rxcounts(priv, &TotalRxBcnNum, &TotalRxDataNum);
+               if ((TotalRxBcnNum+TotalRxDataNum) == 0) {
+#ifdef TODO
+                       if (rfState == eRfOff)
+                               RT_TRACE(COMP_ERR, "========>%s()\n", __func__);
+#endif
+                       netdev_dbg(dev, "===>%s(): AP is power off, connect another one\n", __func__);
+                       priv->ieee80211->state = IEEE80211_ASSOCIATING;
+                       notify_wx_assoc_event(priv->ieee80211);
+                       RemovePeerTS(priv->ieee80211, priv->ieee80211->current_network.bssid);
+                       priv->ieee80211->link_change(dev);
+                       queue_work(priv->ieee80211->wq, &priv->ieee80211->associate_procedure_wq);
 
-                       }
                }
-               priv->ieee80211->LinkDetectInfo.NumRecvBcnInPeriod = 0;
-               priv->ieee80211->LinkDetectInfo.NumRecvDataInPeriod = 0;
        }
-//     CAM_read_entry(dev,4);
+       priv->ieee80211->LinkDetectInfo.NumRecvBcnInPeriod = 0;
+       priv->ieee80211->LinkDetectInfo.NumRecvDataInPeriod = 0;
        //check if reset the driver
-       if (check_reset_cnt++ >= 3)
-       {
+       if (check_reset_cnt++ >= 3) {
                ResetType = rtl819x_ifcheck_resetornot(dev);
                check_reset_cnt = 3;
-               //DbgPrint("Start to check silent reset\n");
        }
-       //      RT_TRACE(COMP_RESET,"%s():priv->force_reset is %d,priv->ResetProgress is %d, priv->bForcedSilentReset is %d,priv->bDisableNormalResetCheck is %d,ResetType is %d\n",__FUNCTION__,priv->force_reset,priv->ResetProgress,priv->bForcedSilentReset,priv->bDisableNormalResetCheck,ResetType);
        if ((priv->force_reset) || (priv->ResetProgress == RESET_TYPE_NORESET &&
-               (priv->bForcedSilentReset ||
-               (!priv->bDisableNormalResetCheck && ResetType == RESET_TYPE_SILENT)))) // This is control by OID set in Pomelo
-       {
+           (priv->bForcedSilentReset ||
+           (!priv->bDisableNormalResetCheck && ResetType == RESET_TYPE_SILENT)))) { // This is control by OID set in Pomelo
                RT_TRACE(COMP_RESET, "%s():priv->force_reset is %d,priv->ResetProgress is %d, priv->bForcedSilentReset is %d,priv->bDisableNormalResetCheck is %d,ResetType is %d\n", __func__, priv->force_reset, priv->ResetProgress, priv->bForcedSilentReset, priv->bDisableNormalResetCheck, ResetType);
                rtl819x_ifsilentreset(dev);
        }
@@ -4093,30 +3610,26 @@ extern  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);
-       //printk("===============>watch_dog timer\n");
        queue_delayed_work(priv->priv_wq, &priv->watch_dog_wq, 0);
        mod_timer(&priv->watch_dog_timer, jiffies + MSECS(IEEE80211_WATCH_DOG_TIME));
 }
 int _rtl8192_up(struct net_device *dev)
 {
        struct r8192_priv *priv = ieee80211_priv(dev);
-       //int i;
        int init_status = 0;
        priv->up = 1;
        priv->ieee80211->ieee_up = 1;
        RT_TRACE(COMP_INIT, "Bringing up iface");
        init_status = rtl8192_adapter_start(dev);
-       if (!init_status)
-       {
+       if (!init_status) {
                RT_TRACE(COMP_ERR, "ERR!!! %s(): initialization failed!\n", __func__);
                priv->up = priv->ieee80211->ieee_up = 0;
                return -EAGAIN;
        }
        RT_TRACE(COMP_INIT, "start adapter finished\n");
        rtl8192_rx_enable(dev);
-//     rtl8192_tx_enable(dev);
        if (priv->ieee80211->state != IEEE80211_LINKED)
-       ieee80211_softmac_start_protocol(priv->ieee80211);
+               ieee80211_softmac_start_protocol(priv->ieee80211);
        ieee80211_reset_queue(priv->ieee80211);
        watch_dog_timer_callback((unsigned long) dev);
        if (!netif_queue_stopped(dev))
@@ -4175,27 +3688,22 @@ int rtl8192_down(struct net_device *dev)
        priv->up = 0;
        priv->ieee80211->ieee_up = 0;
        RT_TRACE(COMP_DOWN, "==========>%s()\n", __func__);
-/* FIXME */
+       /* FIXME */
        if (!netif_queue_stopped(dev))
                netif_stop_queue(dev);
 
        rtl8192_rtx_disable(dev);
-       //rtl8192_irq_disable(dev);
 
- /* Tx related queue release */
-       for (i = 0; i < MAX_QUEUE_SIZE; i++) {
-               skb_queue_purge(&priv->ieee80211->skb_waitQ [i]);
-       }
-       for (i = 0; i < MAX_QUEUE_SIZE; i++) {
-               skb_queue_purge(&priv->ieee80211->skb_aggQ [i]);
-       }
+       /* Tx related queue release */
+       for (i = 0; i < MAX_QUEUE_SIZE; i++)
+               skb_queue_purge(&priv->ieee80211->skb_waitQ[i]);
+       for (i = 0; i < MAX_QUEUE_SIZE; i++)
+               skb_queue_purge(&priv->ieee80211->skb_aggQ[i]);
 
-       for (i = 0; i < MAX_QUEUE_SIZE; i++) {
-               skb_queue_purge(&priv->ieee80211->skb_drv_aggQ [i]);
-       }
+       for (i = 0; i < MAX_QUEUE_SIZE; i++)
+               skb_queue_purge(&priv->ieee80211->skb_drv_aggQ[i]);
 
        //as cancel_delayed_work will del work->timer, so if work is not defined as struct delayed_work, it will corrupt
-//     flush_scheduled_work();
        rtl8192_cancel_deferred_work(priv);
        deinit_hal_dm(dev);
        del_timer_sync(&priv->watch_dog_timer);
@@ -4205,7 +3713,7 @@ int rtl8192_down(struct net_device *dev)
        memset(&priv->ieee80211->current_network, 0, offsetof(struct ieee80211_network, list));
        RT_TRACE(COMP_DOWN, "<==========%s()\n", __func__);
 
-               return 0;
+       return 0;
 }
 
 
@@ -4213,27 +3721,19 @@ void rtl8192_commit(struct net_device *dev)
 {
        struct r8192_priv *priv = ieee80211_priv(dev);
        int reset_status = 0;
-       //u8 reset_times = 0;
        if (priv->up == 0) return;
        priv->up = 0;
 
        rtl8192_cancel_deferred_work(priv);
        del_timer_sync(&priv->watch_dog_timer);
-       //cancel_delayed_work(&priv->SwChnlWorkItem);
 
        ieee80211_softmac_stop_protocol(priv->ieee80211);
 
-       //rtl8192_irq_disable(dev);
        rtl8192_rtx_disable(dev);
        reset_status = _rtl8192_up(dev);
 
 }
 
-/*
-void rtl8192_restart(struct net_device *dev)
-{
-       struct r8192_priv *priv = ieee80211_priv(dev);
-*/
 void rtl8192_restart(struct work_struct *work)
 {
        struct r8192_priv *priv = container_of(work, struct r8192_priv, reset_wq);
@@ -4251,19 +3751,13 @@ 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;
+       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 = promisc;
 }
 
 
@@ -4292,92 +3786,83 @@ int rtl8192_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)
        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;
+       struct ieee_param *ipw = NULL;
 
        down(&priv->wx_sem);
 
 
-     if (p->length < sizeof(struct ieee_param) || !p->pointer){
-            ret = -EINVAL;
-            goto out;
+       if (p->length < sizeof(struct ieee_param) || !p->pointer) {
+               ret = -EINVAL;
+               goto out;
        }
 
-     ipw = kmalloc(p->length, GFP_KERNEL);
-     if (ipw == NULL){
-            ret = -ENOMEM;
-            goto out;
-     }
-     if (copy_from_user(ipw, p->pointer, p->length)) {
+       ipw = kmalloc(p->length, GFP_KERNEL);
+       if (ipw == NULL) {
+               ret = -ENOMEM;
+               goto out;
+       }
+       if (copy_from_user(ipw, p->pointer, p->length)) {
                kfree(ipw);
-           ret = -EFAULT;
-           goto out;
+               ret = -EFAULT;
+               goto out;
        }
 
        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)
+               //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)
+                               } 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)
-                               {
+                               } 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
+                               } else {
                                        ieee->pairwise_key_type = KEY_TYPE_NA;
+                               }
 
-                               if (ieee->pairwise_key_type)
-                               {
+                               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.
+                                       //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)
-                                       setKey(dev, ipw->u.crypt.idx, ipw->u.crypt.idx, ieee->pairwise_key_type, (u8 *)ieee->ap_mac_addr, 0, key);
+                                               setKey(dev, ipw->u.crypt.idx, ipw->u.crypt.idx, ieee->pairwise_key_type, (u8 *)ieee->ap_mac_addr, 0, key);
                                }
-                       }
-                       else //if (ipw->u.crypt.idx) //group key use idx > 0
-                       {
+                       } else {
                                memcpy((u8 *)key, ipw->u.crypt.key, 16);
-                               if (strcmp(ipw->u.crypt.alg, "CCMP") == 0)
+                               if (strcmp(ipw->u.crypt.alg, "CCMP") == 0) {
                                        ieee->group_key_type = KEY_TYPE_CCMP;
-                               else if (strcmp(ipw->u.crypt.alg, "TKIP") == 0)
+                               } 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)
-                               {
+                               } 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
+                               } 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
+                               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
                                }
                        }
                }
 #ifdef JOHN_HWSEC_DEBUG
                //john's test 0711
                printk("@@ wrq->u pointer = ");
-               for (i = 0; i < wrq->u.data.length; i++){
+               for (i = 0; i < wrq->u.data.length; i++) {
                        if (i%10 == 0) printk("\n");
                        printk("%8x|", ((u32 *)wrq->u.data.pointer)[i]);
                }
@@ -4503,7 +3988,6 @@ void rtl8192_process_phyinfo(struct r8192_priv *priv, u8 *buffer, struct ieee802
        bool bcheck = false;
        u8      rfpath;
        u32     nspatial_stream, tmp_val;
-       //u8    i;
        static u32 slide_rssi_index, slide_rssi_statistics;
        static u32 slide_evm_index, slide_evm_statistics;
        static u32 last_rssi, last_evm;
@@ -4523,14 +4007,12 @@ void rtl8192_process_phyinfo(struct r8192_priv *priv, u8 *buffer, struct ieee802
        //
        // Check whether we should take the previous packet into accounting
        //
-       if (!pprevious_stats->bIsAMPDU)
-       {
+       if (!pprevious_stats->bIsAMPDU) {
                // if previous packet is not aggregated packet
                bcheck = true;
        }
 
-       if (slide_rssi_statistics++ >= PHY_RSSI_SLID_WIN_MAX)
-       {
+       if (slide_rssi_statistics++ >= PHY_RSSI_SLID_WIN_MAX) {
                slide_rssi_statistics = PHY_RSSI_SLID_WIN_MAX;
                last_rssi = priv->stats.slide_signal_strength[slide_rssi_index];
                priv->stats.slide_rssi_total -= last_rssi;
@@ -4548,8 +4030,7 @@ void rtl8192_process_phyinfo(struct r8192_priv *priv, u8 *buffer, struct ieee802
        //
        // If the previous packet does not match the criteria, neglect it
        //
-       if (!pprevious_stats->bPacketMatchBSSID)
-       {
+       if (!pprevious_stats->bPacketMatchBSSID) {
                if (!pprevious_stats->bToSelfBA)
                        return;
        }
@@ -4570,31 +4051,23 @@ void rtl8192_process_phyinfo(struct r8192_priv *priv, u8 *buffer, struct ieee802
 
        // <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 || pprevious_stats->bToSelfBA))
-       {
-               for (rfpath = RF90_PATH_A; rfpath < priv->NumTotalRFPath; rfpath++)
-               {
-                    if (!rtl8192_phy_CheckIsLegalRFPath(priv->ieee80211->dev, rfpath))
-                                continue;
+       if (!pprevious_stats->bIsCCK && (pprevious_stats->bPacketToSelf || pprevious_stats->bToSelfBA)) {
+               for (rfpath = RF90_PATH_A; rfpath < priv->NumTotalRFPath; rfpath++) {
+                       if (!rtl8192_phy_CheckIsLegalRFPath(priv->ieee80211->dev, rfpath))
+                               continue;
 
                        //Fixed by Jacken 2008-03-20
                        if (priv->stats.rx_rssi_percentage[rfpath] == 0)
-                       {
                                priv->stats.rx_rssi_percentage[rfpath] = pprevious_stats->RxMIMOSignalStrength[rfpath];
-                               //DbgPrint("MIMO RSSI initialize \n");
-                       }
-                       if (pprevious_stats->RxMIMOSignalStrength[rfpath]  > priv->stats.rx_rssi_percentage[rfpath])
-                       {
+                       if (pprevious_stats->RxMIMOSignalStrength[rfpath]  > priv->stats.rx_rssi_percentage[rfpath]) {
                                priv->stats.rx_rssi_percentage[rfpath] =
                                        ((priv->stats.rx_rssi_percentage[rfpath]*(Rx_Smooth_Factor-1)) +
-                                       (pprevious_stats->RxMIMOSignalStrength[rfpath])) /(Rx_Smooth_Factor);
+                                        (pprevious_stats->RxMIMOSignalStrength[rfpath])) /(Rx_Smooth_Factor);
                                priv->stats.rx_rssi_percentage[rfpath] = priv->stats.rx_rssi_percentage[rfpath]  + 1;
-                       }
-                       else
-                       {
+                       } else {
                                priv->stats.rx_rssi_percentage[rfpath] =
                                        ((priv->stats.rx_rssi_percentage[rfpath]*(Rx_Smooth_Factor-1)) +
-                                       (pprevious_stats->RxMIMOSignalStrength[rfpath])) /(Rx_Smooth_Factor);
+                                        (pprevious_stats->RxMIMOSignalStrength[rfpath])) /(Rx_Smooth_Factor);
                        }
                        RT_TRACE(COMP_DBG, "priv->stats.rx_rssi_percentage[rfPath]  = %d \n", priv->stats.rx_rssi_percentage[rfpath]);
                }
@@ -4605,23 +4078,18 @@ void rtl8192_process_phyinfo(struct r8192_priv *priv, u8 *buffer, struct ieee802
        // Check PWDB.
        //
        RT_TRACE(COMP_RXDESC, "Smooth %s PWDB = %d\n",
-                               pprevious_stats->bIsCCK? "CCK": "OFDM",
-                               pprevious_stats->RxPWDBAll);
+                pprevious_stats->bIsCCK ? "CCK" : "OFDM",
+                pprevious_stats->RxPWDBAll);
 
-       if (pprevious_stats->bPacketBeacon)
-       {
-/* record the beacon pwdb to the sliding window. */
-               if (slide_beacon_adc_pwdb_statistics++ >= PHY_Beacon_RSSI_SLID_WIN_MAX)
-               {
+       if (pprevious_stats->bPacketBeacon) {
+               /* record the beacon pwdb to the sliding window. */
+               if (slide_beacon_adc_pwdb_statistics++ >= PHY_Beacon_RSSI_SLID_WIN_MAX) {
                        slide_beacon_adc_pwdb_statistics = PHY_Beacon_RSSI_SLID_WIN_MAX;
                        last_beacon_adc_pwdb = priv->stats.Slide_Beacon_pwdb[slide_beacon_adc_pwdb_index];
                        priv->stats.Slide_Beacon_Total -= last_beacon_adc_pwdb;
-                       //DbgPrint("slide_beacon_adc_pwdb_index = %d, last_beacon_adc_pwdb = %d, Adapter->RxStats.Slide_Beacon_Total = %d\n",
-                       //      slide_beacon_adc_pwdb_index, last_beacon_adc_pwdb, Adapter->RxStats.Slide_Beacon_Total);
                }
                priv->stats.Slide_Beacon_Total += pprevious_stats->RxPWDBAll;
                priv->stats.Slide_Beacon_pwdb[slide_beacon_adc_pwdb_index] = pprevious_stats->RxPWDBAll;
-               //DbgPrint("slide_beacon_adc_pwdb_index = %d, pPreviousRfd->Status.RxPWDBAll = %d\n", slide_beacon_adc_pwdb_index, pPreviousRfd->Status.RxPWDBAll);
                slide_beacon_adc_pwdb_index++;
                if (slide_beacon_adc_pwdb_index >= PHY_Beacon_RSSI_SLID_WIN_MAX)
                        slide_beacon_adc_pwdb_index = 0;
@@ -4631,29 +4099,22 @@ void rtl8192_process_phyinfo(struct r8192_priv *priv, u8 *buffer, struct ieee802
        }
 
        RT_TRACE(COMP_RXDESC, "Smooth %s PWDB = %d\n",
-                               pprevious_stats->bIsCCK? "CCK": "OFDM",
-                               pprevious_stats->RxPWDBAll);
+                pprevious_stats->bIsCCK ? "CCK" : "OFDM",
+                pprevious_stats->RxPWDBAll);
 
 
-       if (pprevious_stats->bPacketToSelf || pprevious_stats->bPacketBeacon || pprevious_stats->bToSelfBA)
-       {
+       if (pprevious_stats->bPacketToSelf || pprevious_stats->bPacketBeacon || pprevious_stats->bToSelfBA) {
                if (priv->undecorated_smoothed_pwdb < 0)        // initialize
-               {
                        priv->undecorated_smoothed_pwdb = pprevious_stats->RxPWDBAll;
-                       //DbgPrint("First pwdb initialize \n");
-               }
-               if (pprevious_stats->RxPWDBAll > (u32)priv->undecorated_smoothed_pwdb)
-               {
+               if (pprevious_stats->RxPWDBAll > (u32)priv->undecorated_smoothed_pwdb) {
                        priv->undecorated_smoothed_pwdb =
-                                       (((priv->undecorated_smoothed_pwdb)*(Rx_Smooth_Factor-1)) +
-                                       (pprevious_stats->RxPWDBAll)) /(Rx_Smooth_Factor);
+                               (((priv->undecorated_smoothed_pwdb)*(Rx_Smooth_Factor-1)) +
+                                (pprevious_stats->RxPWDBAll)) /(Rx_Smooth_Factor);
                        priv->undecorated_smoothed_pwdb = priv->undecorated_smoothed_pwdb + 1;
-               }
-               else
-               {
+               } else {
                        priv->undecorated_smoothed_pwdb =
-                                       (((priv->undecorated_smoothed_pwdb)*(Rx_Smooth_Factor-1)) +
-                                       (pprevious_stats->RxPWDBAll)) /(Rx_Smooth_Factor);
+                               (((priv->undecorated_smoothed_pwdb)*(Rx_Smooth_Factor-1)) +
+                                (pprevious_stats->RxPWDBAll)) /(Rx_Smooth_Factor);
                }
 
        }
@@ -4662,13 +4123,9 @@ void rtl8192_process_phyinfo(struct r8192_priv *priv, u8 *buffer, struct ieee802
        // Check EVM
        //
        /* record the general EVM to the sliding window. */
-       if (pprevious_stats->SignalQuality == 0)
-       {
-       }
-       else
-       {
-               if (pprevious_stats->bPacketToSelf || pprevious_stats->bPacketBeacon || pprevious_stats->bToSelfBA){
-                       if (slide_evm_statistics++ >= PHY_RSSI_SLID_WIN_MAX){
+       if (pprevious_stats->SignalQuality) {
+               if (pprevious_stats->bPacketToSelf || pprevious_stats->bPacketBeacon || pprevious_stats->bToSelfBA) {
+                       if (slide_evm_statistics++ >= PHY_RSSI_SLID_WIN_MAX) {
                                slide_evm_statistics = PHY_RSSI_SLID_WIN_MAX;
                                last_evm = priv->stats.slide_evm[slide_evm_index];
                                priv->stats.slide_evm_total -= last_evm;
@@ -4688,19 +4145,14 @@ void rtl8192_process_phyinfo(struct r8192_priv *priv, u8 *buffer, struct ieee802
                }
 
                // <2> Showed on UI for engineering
-               if (pprevious_stats->bPacketToSelf || pprevious_stats->bPacketBeacon || pprevious_stats->bToSelfBA)
-               {
-                       for (nspatial_stream = 0; nspatial_stream < 2; nspatial_stream++) // 2 spatial stream
-                       {
-                               if (pprevious_stats->RxMIMOSignalQuality[nspatial_stream] != -1)
-                               {
+               if (pprevious_stats->bPacketToSelf || pprevious_stats->bPacketBeacon || pprevious_stats->bToSelfBA) {
+                       for (nspatial_stream = 0; nspatial_stream < 2; nspatial_stream++) { // 2 spatial stream
+                               if (pprevious_stats->RxMIMOSignalQuality[nspatial_stream] != -1) {
                                        if (priv->stats.rx_evm_percentage[nspatial_stream] == 0) // initialize
-                                       {
                                                priv->stats.rx_evm_percentage[nspatial_stream] = pprevious_stats->RxMIMOSignalQuality[nspatial_stream];
-                                       }
                                        priv->stats.rx_evm_percentage[nspatial_stream] =
                                                ((priv->stats.rx_evm_percentage[nspatial_stream]* (Rx_Smooth_Factor-1)) +
-                                               (pprevious_stats->RxMIMOSignalQuality[nspatial_stream]* 1)) / (Rx_Smooth_Factor);
+                                                (pprevious_stats->RxMIMOSignalQuality[nspatial_stream]* 1)) / (Rx_Smooth_Factor);
                                }
                        }
                }
@@ -4725,126 +4177,104 @@ void rtl8192_process_phyinfo(struct r8192_priv *priv, u8 *buffer, struct ieee802
  *     05/26/2008      amy             Create Version 0 porting from windows code.
  *
  *---------------------------------------------------------------------------*/
-static u8 rtl819x_query_rxpwrpercentage(
-       char            antpower
-       )
+static u8 rtl819x_query_rxpwrpercentage(char antpower)
 {
        if ((antpower <= -100) || (antpower >= 20))
-       {
                return  0;
-       }
        else if (antpower >= 0)
-       {
                return  100;
-       }
        else
-       {
-               return  (100+antpower);
-       }
+               return  100 + antpower;
 
 }      /* QueryRxPwrPercentage */
 
-static u8
-rtl819x_evm_dbtopercentage(
-    char value
-    )
+static u8 rtl819x_evm_dbtopercentage(char value)
 {
-    char ret_val;
+       char ret_val;
 
-    ret_val = value;
+       ret_val = value;
 
-    if (ret_val >= 0)
-       ret_val = 0;
-    if (ret_val <= -33)
-       ret_val = -33;
-    ret_val = 0 - ret_val;
-    ret_val *= 3;
+       if (ret_val >= 0)
+               ret_val = 0;
+       if (ret_val <= -33)
+               ret_val = -33;
+       ret_val = 0 - ret_val;
+       ret_val *= 3;
        if (ret_val == 99)
                ret_val = 100;
-    return(ret_val);
+       return ret_val;
 }
 //
 //     Description:
 //     We want good-looking for signal strength/quality
 //     2007/7/19 01:09, by cosa.
 //
-long
-rtl819x_signal_scale_mapping(
-       long currsig
-       )
+long rtl819x_signal_scale_mapping(long currsig)
 {
        long retsig;
 
        // Step 1. Scale mapping.
        if (currsig >= 61 && currsig <= 100)
-       {
                retsig = 90 + ((currsig - 60) / 4);
-       }
        else if (currsig >= 41 && currsig <= 60)
-       {
                retsig = 78 + ((currsig - 40) / 2);
-       }
        else if (currsig >= 31 && currsig <= 40)
-       {
                retsig = 66 + (currsig - 30);
-       }
        else if (currsig >= 21 && currsig <= 30)
-       {
                retsig = 54 + (currsig - 20);
-       }
        else if (currsig >= 5 && currsig <= 20)
-       {
                retsig = 42 + (((currsig - 5) * 2) / 3);
-       }
        else if (currsig == 4)
-       {
                retsig = 36;
-       }
        else if (currsig == 3)
-       {
                retsig = 27;
-       }
        else if (currsig == 2)
-       {
                retsig = 18;
-       }
        else if (currsig == 1)
-       {
                retsig = 9;
-       }
        else
-       {
                retsig = currsig;
-       }
 
        return retsig;
 }
 
-static void rtl8192_query_rxphystatus(
-       struct r8192_priv *priv,
-       struct ieee80211_rx_stats *pstats,
-       rx_drvinfo_819x_usb  *pdrvinfo,
-       struct ieee80211_rx_stats *precord_stats,
-       bool bpacket_match_bssid,
-       bool bpacket_toself,
-       bool bPacketBeacon,
-       bool bToSelfBA
-       )
+static inline bool rx_hal_is_cck_rate(struct rx_drvinfo_819x_usb *pdrvinfo)
+{
+       if (pdrvinfo->RxHT)
+               return false;
+
+       switch (pdrvinfo->RxRate) {
+       case DESC90_RATE1M:
+       case DESC90_RATE2M:
+       case DESC90_RATE5_5M:
+       case DESC90_RATE11M:
+               return true;
+       default:
+               return false;
+       }
+}
+
+static void rtl8192_query_rxphystatus(struct r8192_priv *priv,
+                                     struct ieee80211_rx_stats *pstats,
+                                     rx_drvinfo_819x_usb  *pdrvinfo,
+                                     struct ieee80211_rx_stats *precord_stats,
+                                     bool bpacket_match_bssid,
+                                     bool bpacket_toself,
+                                     bool bPacketBeacon,
+                                     bool bToSelfBA)
 {
-       //PRT_RFD_STATUS                pRtRfdStatus = &(pRfd->Status);
        phy_sts_ofdm_819xusb_t *pofdm_buf;
        phy_sts_cck_819xusb_t   *pcck_buf;
        phy_ofdm_rx_status_rxsc_sgien_exintfflag *prxsc;
        u8                              *prxpkt;
        u8                              i, max_spatial_stream, tmp_rxsnr, tmp_rxevm, rxsc_sgien_exflg;
        char                            rx_pwr[4], rx_pwr_all = 0;
-       //long                          rx_avg_pwr = 0;
        char                            rx_snrX, rx_evmX;
        u8                              evm, pwdb_all;
-       u32                             RSSI, total_rssi = 0;//, total_evm=0;
-//     long                            signal_strength_index = 0;
+       u32                             RSSI, total_rssi = 0;
        u8                              is_cck_rate = 0;
        u8                              rf_rx_num = 0;
+       u8                              sq;
 
 
        priv->stats.numqry_phystatus++;
@@ -4855,7 +4285,7 @@ static void rtl8192_query_rxphystatus(
        memset(precord_stats, 0, sizeof(struct ieee80211_rx_stats));
        pstats->bPacketMatchBSSID = precord_stats->bPacketMatchBSSID = bpacket_match_bssid;
        pstats->bPacketToSelf = precord_stats->bPacketToSelf = bpacket_toself;
-       pstats->bIsCCK = precord_stats->bIsCCK = is_cck_rate;//RX_HAL_IS_CCK_RATE(pDrvInfo);
+       pstats->bIsCCK = precord_stats->bIsCCK = is_cck_rate;
        pstats->bPacketBeacon = precord_stats->bPacketBeacon = bPacketBeacon;
        pstats->bToSelfBA = precord_stats->bToSelfBA = bToSelfBA;
 
@@ -4873,8 +4303,7 @@ static void rtl8192_query_rxphystatus(
        precord_stats->RxMIMOSignalQuality[0] = -1;
        precord_stats->RxMIMOSignalQuality[1] = -1;
 
-       if (is_cck_rate)
-       {
+       if (is_cck_rate) {
                //
                // (1)Hardware does not provide RSSI for CCK
                //
@@ -4882,51 +4311,46 @@ static void rtl8192_query_rxphystatus(
                //
                // (2)PWDB, Average PWDB cacluated by hardware (for rate adaptive)
                //
-               u8 report;//, cck_agc_rpt;
+               u8 report;
 
                priv->stats.numqry_phystatusCCK++;
 
-               if (!priv->bCckHighPower)
-               {
+               if (!priv->bCckHighPower) {
                        report = pcck_buf->cck_agc_rpt & 0xc0;
                        report = report>>6;
-                       switch (report)
-                       {
+                       switch (report) {
                                //Fixed by Jacken from Bryant 2008-03-20
                                //Original value is -38 , -26 , -14 , -2
                                //Fixed value is -35 , -23 , -11 , 6
-                               case 0x3:
-                                       rx_pwr_all = -35 - (pcck_buf->cck_agc_rpt & 0x3e);
-                                       break;
-                               case 0x2:
-                                       rx_pwr_all = -23 - (pcck_buf->cck_agc_rpt & 0x3e);
-                                       break;
-                               case 0x1:
-                                       rx_pwr_all = -11 - (pcck_buf->cck_agc_rpt & 0x3e);
-                                       break;
-                               case 0x0:
-                                       rx_pwr_all = 6 - (pcck_buf->cck_agc_rpt & 0x3e);
-                                       break;
+                       case 0x3:
+                               rx_pwr_all = -35 - (pcck_buf->cck_agc_rpt & 0x3e);
+                               break;
+                       case 0x2:
+                               rx_pwr_all = -23 - (pcck_buf->cck_agc_rpt & 0x3e);
+                               break;
+                       case 0x1:
+                               rx_pwr_all = -11 - (pcck_buf->cck_agc_rpt & 0x3e);
+                               break;
+                       case 0x0:
+                               rx_pwr_all = 6 - (pcck_buf->cck_agc_rpt & 0x3e);
+                               break;
                        }
-               }
-               else
-               {
+               } else {
                        report = pcck_buf->cck_agc_rpt & 0x60;
                        report = report>>5;
-                       switch (report)
-                       {
-                               case 0x3:
-                                       rx_pwr_all = -35 - ((pcck_buf->cck_agc_rpt & 0x1f)<<1);
-                                       break;
-                               case 0x2:
-                                       rx_pwr_all = -23 - ((pcck_buf->cck_agc_rpt & 0x1f)<<1);
-                                       break;
-                               case 0x1:
-                                       rx_pwr_all = -11 - ((pcck_buf->cck_agc_rpt & 0x1f)<<1);
-                                       break;
-                               case 0x0:
-                                       rx_pwr_all = 6 - ((pcck_buf->cck_agc_rpt & 0x1f)<<1);
-                                       break;
+                       switch (report) {
+                       case 0x3:
+                               rx_pwr_all = -35 - ((pcck_buf->cck_agc_rpt & 0x1f)<<1);
+                               break;
+                       case 0x2:
+                               rx_pwr_all = -23 - ((pcck_buf->cck_agc_rpt & 0x1f)<<1);
+                               break;
+                       case 0x1:
+                               rx_pwr_all = -11 - ((pcck_buf->cck_agc_rpt & 0x1f)<<1);
+                               break;
+                       case 0x0:
+                               rx_pwr_all = 6 - ((pcck_buf->cck_agc_rpt & 0x1f)<<1);
+                               break;
                        }
                }
 
@@ -4937,44 +4361,36 @@ static void rtl8192_query_rxphystatus(
                //
                // (3) Get Signal Quality (EVM)
                //
-               //if(bpacket_match_bssid)
-               {
-                       u8      sq;
 
-                       if (pstats->RxPWDBAll > 40)
-                       {
-                               sq = 100;
-                       } else
-                       {
-                               sq = pcck_buf->sq_rpt;
+               if (pstats->RxPWDBAll > 40) {
+                       sq = 100;
+               } else {
+                       sq = pcck_buf->sq_rpt;
 
-                               if (pcck_buf->sq_rpt > 64)
-                                       sq = 0;
-                               else if (pcck_buf->sq_rpt < 20)
-                                       sq = 100;
-                               else
-                                       sq = ((64-sq) * 100) / 44;
-                       }
-                       pstats->SignalQuality = precord_stats->SignalQuality = sq;
-                       pstats->RxMIMOSignalQuality[0] = precord_stats->RxMIMOSignalQuality[0] = sq;
-                       pstats->RxMIMOSignalQuality[1] = precord_stats->RxMIMOSignalQuality[1] = -1;
+                       if (pcck_buf->sq_rpt > 64)
+                               sq = 0;
+                       else if (pcck_buf->sq_rpt < 20)
+                               sq = 100;
+                       else
+                               sq = ((64-sq) * 100) / 44;
                }
-       }
-       else
-       {
+               pstats->SignalQuality = precord_stats->SignalQuality = sq;
+               pstats->RxMIMOSignalQuality[0] = precord_stats->RxMIMOSignalQuality[0] = sq;
+               pstats->RxMIMOSignalQuality[1] = precord_stats->RxMIMOSignalQuality[1] = -1;
+
+       } else {
                priv->stats.numqry_phystatusHT++;
                //
                // (1)Get RSSI for HT rate
                //
-               for (i = RF90_PATH_A; i < priv->NumTotalRFPath; i++)
-               {
+               for (i = RF90_PATH_A; i < priv->NumTotalRFPath; i++) {
                        // 2008/01/30 MH we will judge RF RX path now.
                        if (priv->brfpath_rxenable[i])
                                rf_rx_num++;
                        else
                                continue;
 
-               if (!rtl8192_phy_CheckIsLegalRFPath(priv->ieee80211->dev, i))
+                       if (!rtl8192_phy_CheckIsLegalRFPath(priv->ieee80211->dev, i))
                                continue;
 
                        //Fixed by Jacken from Bryant 2008-03-20
@@ -4984,7 +4400,6 @@ static void rtl8192_query_rxphystatus(
                        //Get Rx snr value in DB
                        tmp_rxsnr =     pofdm_buf->rxsnr_X[i];
                        rx_snrX = (char)(tmp_rxsnr);
-                       //rx_snrX >>= 1;
                        rx_snrX /= 2;
                        priv->stats.rxSNRdB[i] = (long)rx_snrX;
 
@@ -4993,11 +4408,8 @@ static void rtl8192_query_rxphystatus(
                        total_rssi += RSSI;
 
                        /* Record Signal Strength for next packet */
-                       //if(bpacket_match_bssid)
-                       {
-                               pstats->RxMIMOSignalStrength[i] = (u8) RSSI;
-                               precord_stats->RxMIMOSignalStrength[i] = (u8) RSSI;
-                       }
+                       pstats->RxMIMOSignalStrength[i] = (u8) RSSI;
+                       precord_stats->RxMIMOSignalStrength[i] = (u8) RSSI;
                }
 
 
@@ -5016,13 +4428,12 @@ static void rtl8192_query_rxphystatus(
                // (3)EVM of HT rate
                //
                if (pdrvinfo->RxHT && pdrvinfo->RxRate >= DESC90_RATEMCS8 &&
-                       pdrvinfo->RxRate <= DESC90_RATEMCS15)
+                   pdrvinfo->RxRate <= DESC90_RATEMCS15)
                        max_spatial_stream = 2; //both spatial stream make sense
                else
                        max_spatial_stream = 1; //only spatial stream 1 makes sense
 
-               for (i = 0; i < max_spatial_stream; i++)
-               {
+               for (i = 0; i < max_spatial_stream; i++) {
                        tmp_rxevm =     pofdm_buf->rxevm_X[i];
                        rx_evmX = (char)(tmp_rxevm);
 
@@ -5032,12 +4443,9 @@ static void rtl8192_query_rxphystatus(
                        rx_evmX /= 2;   //dbm
 
                        evm = rtl819x_evm_dbtopercentage(rx_evmX);
-                       //if(bpacket_match_bssid)
-                       {
-                               if (i == 0) // Fill value in RFD, Get the first spatial stream only
-                                       pstats->SignalQuality = precord_stats->SignalQuality = (u8)(evm & 0xff);
-                               pstats->RxMIMOSignalQuality[i] = precord_stats->RxMIMOSignalQuality[i] = (u8)(evm & 0xff);
-                       }
+                       if (i == 0) // Fill value in RFD, Get the first spatial stream only
+                               pstats->SignalQuality = precord_stats->SignalQuality = (u8)(evm & 0xff);
+                       pstats->RxMIMOSignalQuality[i] = precord_stats->RxMIMOSignalQuality[i] = (u8)(evm & 0xff);
                }
 
 
@@ -5052,25 +4460,17 @@ static void rtl8192_query_rxphystatus(
 
        //UI BSS List signal strength(in percentage), make it good looking, from 0~100.
        //It is assigned to the BSS List in GetValueFromBeaconOrProbeRsp().
-       if (is_cck_rate)
-       {
-               pstats->SignalStrength = precord_stats->SignalStrength = (u8)(rtl819x_signal_scale_mapping((long)pwdb_all));//PWDB_ALL;
-
-       }
-       else
-       {
-               //pRfd->Status.SignalStrength = pRecordRfd->Status.SignalStrength = (u8)(SignalScaleMapping(total_rssi/=RF90_PATH_MAX));//(u8)(total_rssi/=RF90_PATH_MAX);
+       if (is_cck_rate) {
+               pstats->SignalStrength = precord_stats->SignalStrength = (u8)(rtl819x_signal_scale_mapping((long)pwdb_all));
+       } else {
                // We can judge RX path number now.
                if (rf_rx_num != 0)
                        pstats->SignalStrength = precord_stats->SignalStrength = (u8)(rtl819x_signal_scale_mapping((long)(total_rssi /= rf_rx_num)));
        }
 }      /* QueryRxPhyStatus8190Pci */
 
-void
-rtl8192_record_rxdesc_forlateruse(
-       struct ieee80211_rx_stats *psrc_stats,
-       struct ieee80211_rx_stats *ptarget_stats
-)
+void rtl8192_record_rxdesc_forlateruse(struct ieee80211_rx_stats *psrc_stats,
+                                      struct ieee80211_rx_stats *ptarget_stats)
 {
        ptarget_stats->bIsAMPDU = psrc_stats->bIsAMPDU;
        ptarget_stats->bFirstMPDU = psrc_stats->bFirstMPDU;
@@ -5090,16 +4490,15 @@ void TranslateRxSignalStuff819xUsb(struct sk_buff *skb,
        bool bPacketBeacon = FALSE, bToSelfBA = FALSE;
        static struct ieee80211_rx_stats  previous_stats;
        struct ieee80211_hdr_3addr *hdr;//by amy
-       u16 fc, type;
+       u16 fc, type;
 
        // Get Signal Quality for only RX data queue (but not command queue)
 
        u8 *tmp_buf;
-       //u16 tmp_buf_len = 0;
        u8  *praddr;
 
        /* Get MAC frame start address. */
-       tmp_buf = (u8 *)skb->data;// + get_rxpacket_shiftbytes_819xusb(pstats);
+       tmp_buf = (u8 *)skb->data;
 
        hdr = (struct ieee80211_hdr_3addr *)tmp_buf;
        fc = le16_to_cpu(hdr->frame_ctl);
@@ -5108,31 +4507,23 @@ void TranslateRxSignalStuff819xUsb(struct sk_buff *skb,
 
        /* Check if the received packet is acceptable. */
        bpacket_match_bssid = ((IEEE80211_FTYPE_CTL != type) &&
-                                                       (eqMacAddr(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));
+                              (eqMacAddr(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 & (eqMacAddr(praddr, priv->ieee80211->dev->dev_addr));
 
-               if (WLAN_FC_GET_FRAMETYPE(fc) == IEEE80211_STYPE_BEACON)
-               {
-                       bPacketBeacon = true;
-                       //DbgPrint("Beacon 2, MatchBSSID = %d, ToSelf = %d \n", bPacketMatchBSSID, bPacketToSelf);
-               }
-               if (WLAN_FC_GET_FRAMETYPE(fc) == IEEE80211_STYPE_BLOCKACK)
-               {
-                       if ((eqMacAddr(praddr, dev->dev_addr)))
-                               bToSelfBA = true;
-                               //DbgPrint("BlockAck, MatchBSSID = %d, ToSelf = %d \n", bPacketMatchBSSID, bPacketToSelf);
-               }
+       if (WLAN_FC_GET_FRAMETYPE(fc) == IEEE80211_STYPE_BEACON)
+               bPacketBeacon = true;
+       if (WLAN_FC_GET_FRAMETYPE(fc) == IEEE80211_STYPE_BLOCKACK) {
+               if ((eqMacAddr(praddr, dev->dev_addr)))
+                       bToSelfBA = true;
+       }
 
 
 
        if (bpacket_match_bssid)
-       {
                priv->stats.numpacket_matchbssid++;
-       }
-       if (bpacket_toself){
+       if (bpacket_toself)
                priv->stats.numpacket_toself++;
-       }
        //
        // Process PHY information for previous packet (RSSI/PWDB/EVM)
        //
@@ -5158,11 +4549,8 @@ void TranslateRxSignalStuff819xUsb(struct sk_buff *skb,
 * Return:
 *              None
 */
-void
-UpdateReceivedRateHistogramStatistics8190(
-       struct net_device *dev,
-       struct ieee80211_rx_stats *stats
-       )
+void UpdateReceivedRateHistogramStatistics8190(struct net_device *dev,
+                                              struct ieee80211_rx_stats *stats)
 {
        struct r8192_priv *priv = (struct r8192_priv *)ieee80211_priv(dev);
        u32 rcvType = 1;   //0: Total, 1:OK, 2:CRC, 3:ICV
@@ -5171,59 +4559,58 @@ UpdateReceivedRateHistogramStatistics8190(
 
 
        if (stats->bCRC)
-       rcvType = 2;
+               rcvType = 2;
        else if (stats->bICV)
-       rcvType = 3;
+               rcvType = 3;
 
        if (stats->bShortPreamble)
-       preamble_guardinterval = 1;// short
+               preamble_guardinterval = 1;// short
        else
-       preamble_guardinterval = 0;// long
+               preamble_guardinterval = 0;// long
 
-       switch (stats->rate)
-       {
+       switch (stats->rate) {
                //
                // CCK rate
                //
-               case MGN_1M:    rateIndex = 0;  break;
-               case MGN_2M:    rateIndex = 1;  break;
-               case MGN_5_5M:  rateIndex = 2;  break;
-               case MGN_11M:   rateIndex = 3;  break;
+       case MGN_1M:    rateIndex = 0;  break;
+       case MGN_2M:    rateIndex = 1;  break;
+       case MGN_5_5M:  rateIndex = 2;  break;
+       case MGN_11M:   rateIndex = 3;  break;
                //
                // Legacy OFDM rate
                //
-               case MGN_6M:    rateIndex = 4;  break;
-               case MGN_9M:    rateIndex = 5;  break;
-               case MGN_12M:   rateIndex = 6;  break;
-               case MGN_18M:   rateIndex = 7;  break;
-               case MGN_24M:   rateIndex = 8;  break;
-               case MGN_36M:   rateIndex = 9;  break;
-               case MGN_48M:   rateIndex = 10; break;
-               case MGN_54M:   rateIndex = 11; break;
+       case MGN_6M:    rateIndex = 4;  break;
+       case MGN_9M:    rateIndex = 5;  break;
+       case MGN_12M:   rateIndex = 6;  break;
+       case MGN_18M:   rateIndex = 7;  break;
+       case MGN_24M:   rateIndex = 8;  break;
+       case MGN_36M:   rateIndex = 9;  break;
+       case MGN_48M:   rateIndex = 10; break;
+       case MGN_54M:   rateIndex = 11; break;
                //
                // 11n High throughput rate
                //
-               case MGN_MCS0:  rateIndex = 12; break;
-               case MGN_MCS1:  rateIndex = 13; break;
-               case MGN_MCS2:  rateIndex = 14; break;
-               case MGN_MCS3:  rateIndex = 15; break;
-               case MGN_MCS4:  rateIndex = 16; break;
-               case MGN_MCS5:  rateIndex = 17; break;
-               case MGN_MCS6:  rateIndex = 18; break;
-               case MGN_MCS7:  rateIndex = 19; break;
-               case MGN_MCS8:  rateIndex = 20; break;
-               case MGN_MCS9:  rateIndex = 21; break;
-               case MGN_MCS10: rateIndex = 22; break;
-               case MGN_MCS11: rateIndex = 23; break;
-               case MGN_MCS12: rateIndex = 24; break;
-               case MGN_MCS13: rateIndex = 25; break;
-               case MGN_MCS14: rateIndex = 26; break;
-               case MGN_MCS15: rateIndex = 27; break;
-               default:        rateIndex = 28; break;
-       }
-    priv->stats.received_preamble_GI[preamble_guardinterval][rateIndex]++;
-    priv->stats.received_rate_histogram[0][rateIndex]++; //total
-    priv->stats.received_rate_histogram[rcvType][rateIndex]++;
+       case MGN_MCS0:  rateIndex = 12; break;
+       case MGN_MCS1:  rateIndex = 13; break;
+       case MGN_MCS2:  rateIndex = 14; break;
+       case MGN_MCS3:  rateIndex = 15; break;
+       case MGN_MCS4:  rateIndex = 16; break;
+       case MGN_MCS5:  rateIndex = 17; break;
+       case MGN_MCS6:  rateIndex = 18; break;
+       case MGN_MCS7:  rateIndex = 19; break;
+       case MGN_MCS8:  rateIndex = 20; break;
+       case MGN_MCS9:  rateIndex = 21; break;
+       case MGN_MCS10: rateIndex = 22; break;
+       case MGN_MCS11: rateIndex = 23; break;
+       case MGN_MCS12: rateIndex = 24; break;
+       case MGN_MCS13: rateIndex = 25; break;
+       case MGN_MCS14: rateIndex = 26; break;
+       case MGN_MCS15: rateIndex = 27; break;
+       default:        rateIndex = 28; break;
+       }
+       priv->stats.received_preamble_GI[preamble_guardinterval][rateIndex]++;
+       priv->stats.received_rate_histogram[0][rateIndex]++; //total
+       priv->stats.received_rate_histogram[rcvType][rateIndex]++;
 }
 
 
@@ -5232,15 +4619,13 @@ void query_rxdesc_status(struct sk_buff *skb, struct ieee80211_rx_stats *stats,
        rtl8192_rx_info *info = (struct rtl8192_rx_info *)skb->cb;
        struct net_device *dev = info->dev;
        struct r8192_priv *priv = (struct r8192_priv *)ieee80211_priv(dev);
-       //rx_desc_819x_usb *desc = (rx_desc_819x_usb *)skb->data;
        rx_drvinfo_819x_usb  *driver_info = NULL;
 
        //
        //Get Rx Descriptor Information
        //
 #ifdef USB_RX_AGGREGATION_SUPPORT
-       if (bIsRxAggrSubframe)
-       {
+       if (bIsRxAggrSubframe) {
                rx_desc_819x_usb_aggr_subframe *desc = (rx_desc_819x_usb_aggr_subframe *)skb->data;
                stats->Length = desc->Length;
                stats->RxDrvInfoSize = desc->RxDrvInfoSize;
@@ -5256,7 +4641,7 @@ void query_rxdesc_status(struct sk_buff *skb, struct ieee80211_rx_stats *stats,
 
                stats->Length = desc->Length;
                stats->RxDrvInfoSize = desc->RxDrvInfoSize;
-               stats->RxBufShift = 0;//desc->Shift&0x03;
+               stats->RxBufShift = 0;
                stats->bICV = desc->ICV;
                stats->bCRC = desc->CRC32;
                stats->bHwError = stats->bCRC|stats->bICV;
@@ -5265,13 +4650,9 @@ void query_rxdesc_status(struct sk_buff *skb, struct ieee80211_rx_stats *stats,
        }
 
        if ((priv->ieee80211->pHTInfo->bCurrentHTSupport == true) && (priv->ieee80211->pairwise_key_type == KEY_TYPE_CCMP))
-       {
                stats->bHwError = false;
-       }
        else
-       {
                stats->bHwError = stats->bCRC|stats->bICV;
-       }
 
        if (stats->Length < 24 || stats->Length > MAX_8192U_RX_SIZE)
                stats->bHwError |= 1;
@@ -5281,27 +4662,25 @@ void query_rxdesc_status(struct sk_buff *skb, struct ieee80211_rx_stats *stats,
        // TODO: Need to verify it on FGPA platform
        //Driver info are written to the RxBuffer following rx desc
        if (stats->RxDrvInfoSize != 0) {
-               driver_info = (rx_drvinfo_819x_usb *)(skb->data + sizeof(rx_desc_819x_usb) + \
-                               stats->RxBufShift);
+               driver_info = (rx_drvinfo_819x_usb *)(skb->data + sizeof(rx_desc_819x_usb) +
+                                                     stats->RxBufShift);
                /* unit: 0.5M */
                /* TODO */
-               if (!stats->bHwError){
+               if (!stats->bHwError) {
                        u8      ret_rate;
                        ret_rate = HwRateToMRate90(driver_info->RxHT, driver_info->RxRate);
-                       if (ret_rate == 0xff)
-                       {
+                       if (ret_rate == 0xff) {
                                // Abnormal Case: Receive CRC OK packet with Rx descriptor indicating non supported rate.
                                // Special Error Handling here, 2008.05.16, by Emily
 
                                stats->bHwError = 1;
                                stats->rate = MGN_1M;   //Set 1M rate by default
-                       } else
-                       {
+                       } else {
                                stats->rate = ret_rate;
                        }
-               }
-               else
+               } else {
                        stats->rate = 0x02;
+               }
 
                stats->bShortPreamble = driver_info->SPLCP;
 
@@ -5312,8 +4691,6 @@ void query_rxdesc_status(struct sk_buff *skb, struct ieee80211_rx_stats *stats,
                stats->bFirstMPDU = (driver_info->PartAggr == 1) && (driver_info->FirstAGGR == 1);
                stats->TimeStampLow = driver_info->TSFL;
                // xiong mask it, 070514
-               //pRfd->Status.TimeStampHigh = PlatformEFIORead4Byte(Adapter, TSFR+4);
-               // stats->TimeStampHigh = read_nic_dword(dev,  TSFR+4);
 
                UpdateRxPktTimeStamp8190(dev, stats);
 
@@ -5322,7 +4699,7 @@ void query_rxdesc_status(struct sk_buff *skb, struct ieee80211_rx_stats *stats,
                //
                if (driver_info->FirstAGGR == 1 || driver_info->PartAggr == 1)
                        RT_TRACE(COMP_RXDESC, "driver_info->FirstAGGR = %d, driver_info->PartAggr = %d\n",
-                                       driver_info->FirstAGGR, driver_info->PartAggr);
+                                driver_info->FirstAGGR, driver_info->PartAggr);
 
        }
 
@@ -5337,9 +4714,8 @@ void query_rxdesc_status(struct sk_buff *skb, struct ieee80211_rx_stats *stats,
 
 #ifdef USB_RX_AGGREGATION_SUPPORT
        /* for the rx aggregated sub frame, the redundant space truly contained in the packet */
-       if (bIsRxAggrSubframe) {
+       if (bIsRxAggrSubframe)
                skb_pull(skb, 8);
-       }
 #endif
        /* for debug 2008.5.29 */
 
@@ -5359,7 +4735,7 @@ u32 GetRxPacketShiftBytes819xUsb(struct ieee80211_rx_stats  *Status, bool bIsRxA
        else
 #endif
                return (sizeof(rx_desc_819x_usb) + Status->RxDrvInfoSize
-                               + Status->RxBufShift);
+                       + Status->RxBufShift);
 }
 
 void rtl8192_rx_nomal(struct sk_buff *skb)
@@ -5371,7 +4747,6 @@ void rtl8192_rx_nomal(struct sk_buff *skb)
                .signal = 0,
                .noise = -98,
                .rate = 0,
-               //      .mac_time = jiffies,
                .freq = IEEE80211_24GHZ_BAND,
        };
        u32 rx_pkt_len = 0;
@@ -5404,9 +4779,7 @@ void rtl8192_rx_nomal(struct sk_buff *skb)
 #ifdef USB_RX_AGGREGATION_SUPPORT
                if (TempByte & BIT0) {
                        agg_skb = skb;
-                       //TotalLength = agg_skb->len - 4; /*sCrcLng*/
                        TotalLength = stats.Length - 4; /*sCrcLng*/
-                       //RT_TRACE(COMP_RECV, "%s:first aggregated packet!Length=%d\n",__FUNCTION__,TotalLength);
                        /* though the head pointer has passed this position  */
                        TempDWord = *(u32 *)(agg_skb->data - 4);
                        PacketLength = (u16)(TempDWord & 0x3FFF); /*sCrcLng*/
@@ -5423,7 +4796,7 @@ void rtl8192_rx_nomal(struct sk_buff *skb)
                unicast_packet = false;
                if (is_broadcast_ether_addr(ieee80211_hdr->addr1)) {
                        //TODO
-               } else if (is_multicast_ether_addr(ieee80211_hdr->addr1)){
+               } else if (is_multicast_ether_addr(ieee80211_hdr->addr1)) {
                        //TODO
                } else {
                        /* unicast packet */
@@ -5434,13 +4807,11 @@ void rtl8192_rx_nomal(struct sk_buff *skb)
                        dev_kfree_skb_any(skb);
                } else {
                        priv->stats.rxoktotal++;
-                       if (unicast_packet) {
+                       if (unicast_packet)
                                priv->stats.rxbytesunicast += rx_pkt_len;
-                       }
                }
 #ifdef USB_RX_AGGREGATION_SUPPORT
                testing = 1;
-               // (PipeIndex == 0) && (TempByte & BIT0) => TotalLength > 0.
                if (TotalLength > 0) {
                        PacketOccupiedLendth = PacketLength + (PacketShiftBytes + 8);
                        if ((PacketOccupiedLendth & 0xFF) != 0)
@@ -5454,7 +4825,6 @@ void rtl8192_rx_nomal(struct sk_buff *skb)
 
                        while (agg_skb->len >= GetRxPacketShiftBytes819xUsb(&stats, true)) {
                                u8 tmpCRC = 0, tmpICV = 0;
-                               //RT_TRACE(COMP_RECV,"%s:aggred pkt,total_len = %d\n",__FUNCTION__,agg_skb->len);
                                RxDescr = (rx_desc_819x_usb_aggr_subframe *)(agg_skb->data);
                                tmpCRC = RxDescr->CRC32;
                                tmpICV = RxDescr->ICV;
@@ -5470,9 +4840,8 @@ void rtl8192_rx_nomal(struct sk_buff *skb)
                                query_rxdesc_status(agg_skb, &stats, true);
                                PacketLength = stats.Length;
 
-                               if (PacketLength > agg_skb->len) {
+                               if (PacketLength > agg_skb->len)
                                        break;
-                               }
                                /* Process the MPDU received */
                                skb = dev_alloc_skb(PacketLength);
                                memcpy(skb_put(skb, PacketLength), agg_skb->data, PacketLength);
@@ -5483,7 +4852,7 @@ void rtl8192_rx_nomal(struct sk_buff *skb)
                                unicast_packet = false;
                                if (is_broadcast_ether_addr(ieee80211_hdr->addr1)) {
                                        //TODO
-                               } else if (is_multicast_ether_addr(ieee80211_hdr->addr1)){
+                               } else if (is_multicast_ether_addr(ieee80211_hdr->addr1)) {
                                        //TODO
                                } else {
                                        /* unicast packet */
@@ -5493,9 +4862,8 @@ void rtl8192_rx_nomal(struct sk_buff *skb)
                                        dev_kfree_skb_any(skb);
                                } else {
                                        priv->stats.rxoktotal++;
-                                       if (unicast_packet) {
+                                       if (unicast_packet)
                                                priv->stats.rxbytesunicast += rx_pkt_len;
-                                       }
                                }
                                /* should trim the packet which has been copied to target skb */
                                skb_pull(agg_skb, PacketLength);
@@ -5514,26 +4882,18 @@ void rtl8192_rx_nomal(struct sk_buff *skb)
 #endif
        } else {
                priv->stats.rxurberr++;
-               printk("actual_length:%d\n", skb->len);
+               netdev_dbg(dev, "actual_length: %d\n", skb->len);
                dev_kfree_skb_any(skb);
        }
 
 }
 
-void
-rtl819xusb_process_received_packet(
-       struct net_device *dev,
-       struct ieee80211_rx_stats *pstats
-       )
+void rtl819xusb_process_received_packet(struct net_device *dev,
+                                       struct ieee80211_rx_stats *pstats)
 {
-//     bool bfreerfd=false, bqueued=false;
        u8      *frame;
        u16     frame_len = 0;
        struct r8192_priv *priv = ieee80211_priv(dev);
-//     u8                      index = 0;
-//     u8                      TID = 0;
-       //u16                   seqnum = 0;
-       //PRX_TS_RECORD pts = NULL;
 
        // Get shifted bytes of Starting address of 802.11 header. 2006.09.28, by Emily
        //porting by amy 080508
@@ -5544,30 +4904,24 @@ rtl819xusb_process_received_packet(
        if (!Adapter->bInHctTest)
                CountRxErrStatistics(Adapter, pRfd);
 #endif
-       {
-       #ifdef ENABLE_PS  //by amy for adding ps function in future
-               RT_RF_POWER_STATE rtState;
-               // When RF is off, we should not count the packet for hw/sw synchronize
-               // reason, ie. there may be a duration while sw switch is changed and hw
-               // switch is being changed. 2006.12.04, by shien chang.
-               Adapter->HalFunc.GetHwRegHandler(Adapter, HW_VAR_RF_STATE, (u8 *)(&rtState));
-               if (rtState == eRfOff)
-               {
-                       return;
-               }
-       #endif
+#ifdef ENABLE_PS  //by amy for adding ps function in future
+       RT_RF_POWER_STATE rtState;
+       // When RF is off, we should not count the packet for hw/sw synchronize
+       // reason, ie. there may be a duration while sw switch is changed and hw
+       // switch is being changed. 2006.12.04, by shien chang.
+       Adapter->HalFunc.GetHwRegHandler(Adapter, HW_VAR_RF_STATE, (u8 *)(&rtState));
+       if (rtState == eRfOff)
+               return;
+#endif
        priv->stats.rxframgment++;
 
-       }
 #ifdef TODO
        RmMonitorSignalStrength(Adapter, pRfd);
 #endif
        /* 2007/01/16 MH Add RX command packet handle here. */
        /* 2007/03/01 MH We have to release RFD and return if rx pkt is cmd pkt. */
        if (rtl819xusb_rx_command_packet(dev, pstats))
-       {
                return;
-       }
 
 #ifdef SW_CRC_CHECK
        SwCrcCheck();
@@ -5578,11 +4932,7 @@ rtl819xusb_process_received_packet(
 
 void query_rx_cmdpkt_desc_status(struct sk_buff *skb, struct ieee80211_rx_stats *stats)
 {
-//     rtl8192_rx_info *info = (struct rtl8192_rx_info *)skb->cb;
-//     struct net_device *dev=info->dev;
-//     struct r8192_priv *priv = (struct r8192_priv *)ieee80211_priv(dev);
        rx_desc_819x_usb *desc = (rx_desc_819x_usb *)skb->data;
-//     rx_drvinfo_819x_usb  *driver_info;
 
        //
        //Get Rx Descriptor Information
@@ -5602,19 +4952,15 @@ void rtl8192_rx_cmd(struct sk_buff *skb)
 {
        struct rtl8192_rx_info *info = (struct rtl8192_rx_info *)skb->cb;
        struct net_device *dev = info->dev;
-       //int ret;
-//     struct urb *rx_urb = info->urb;
        /* TODO */
        struct ieee80211_rx_stats stats = {
                .signal = 0,
                .noise = -98,
                .rate = 0,
-               //      .mac_time = jiffies,
                .freq = IEEE80211_24GHZ_BAND,
        };
 
-       if ((skb->len >= (20 + sizeof(rx_desc_819x_usb))) && (skb->len < RX_URB_SIZE))
-       {
+       if ((skb->len >= (20 + sizeof(rx_desc_819x_usb))) && (skb->len < RX_URB_SIZE)) {
 
                query_rx_cmdpkt_desc_status(skb, &stats);
                // this is to be done by amy 080508     prfd->queue_id = 1;
@@ -5640,22 +4986,21 @@ void rtl8192_irq_rx_tasklet(struct r8192_priv *priv)
                switch (info->out_pipe) {
                /* Nomal packet pipe */
                case 3:
-                       //RT_TRACE(COMP_RECV, "normal in-pipe index(%d)\n",info->out_pipe);
                        priv->IrpPendingCount--;
                        rtl8192_rx_nomal(skb);
                        break;
 
-                       /* Command packet pipe */
+               /* Command packet pipe */
                case 9:
-                       RT_TRACE(COMP_RECV, "command in-pipe index(%d)\n",\
-                                       info->out_pipe);
+                       RT_TRACE(COMP_RECV, "command in-pipe index(%d)\n",
+                                info->out_pipe);
 
                        rtl8192_rx_cmd(skb);
                        break;
 
                default: /* should never get here! */
-                       RT_TRACE(COMP_ERR, "Unknown in-pipe index(%d)\n",\
-                                       info->out_pipe);
+                       RT_TRACE(COMP_ERR, "Unknown in-pipe index(%d)\n",
+                                info->out_pipe);
                        dev_kfree_skb(skb);
                        break;
 
@@ -5682,9 +5027,8 @@ static const struct net_device_ops rtl8192_netdev_ops = {
 *****************************************************************************/
 
 static int rtl8192_usb_probe(struct usb_interface *intf,
-                        const struct usb_device_id *id)
+                            const struct usb_device_id *id)
 {
-//     unsigned long ioaddr = 0;
        struct net_device *dev = NULL;
        struct r8192_priv *priv = NULL;
        struct usb_device *udev = interface_to_usbdev(intf);
@@ -5703,7 +5047,6 @@ static int rtl8192_usb_probe(struct usb_interface *intf,
 
        dev->netdev_ops = &rtl8192_netdev_ops;
 
-        //DMESG("Oops: i'm coming\n");
 #if WIRELESS_EXT >= 12
 #if WIRELESS_EXT < 17
        dev->get_wireless_stats = r8192_get_wireless_stats;
@@ -5714,14 +5057,14 @@ static int rtl8192_usb_probe(struct usb_interface *intf,
 
        dev->watchdog_timeo = HZ*3;     //modified by john, 0805
 
-       if (dev_alloc_name(dev, ifname) < 0){
+       if (dev_alloc_name(dev, ifname) < 0) {
                RT_TRACE(COMP_INIT, "Oops: devname already taken! Trying wlan%%d...\n");
                ifname = "wlan%d";
                dev_alloc_name(dev, ifname);
        }
 
        RT_TRACE(COMP_INIT, "Driver probe completed1\n");
-       if (rtl8192_init(dev) != 0){
+       if (rtl8192_init(dev) != 0) {
                RT_TRACE(COMP_ERR, "Initialization failed");
                ret = -ENODEV;
                goto fail;
@@ -5762,9 +5105,6 @@ void rtl8192_cancel_deferred_work(struct r8192_priv *priv)
        cancel_delayed_work(&priv->watch_dog_wq);
        cancel_delayed_work(&priv->update_beacon_wq);
        cancel_work_sync(&priv->qos_activate);
-       //cancel_work_sync(&priv->SetBWModeWorkItem);
-       //cancel_work_sync(&priv->SwChnlWorkItem);
-
 }
 
 
@@ -5773,22 +5113,18 @@ static void rtl8192_usb_disconnect(struct usb_interface *intf)
        struct net_device *dev = usb_get_intfdata(intf);
 
        struct r8192_priv *priv = ieee80211_priv(dev);
-       if (dev){
+       if (dev) {
 
                unregister_netdev(dev);
 
                RT_TRACE(COMP_DOWN, "=============>wlan driver to be removed\n");
                rtl8192_proc_remove_one(dev);
 
-                       rtl8192_down(dev);
+               rtl8192_down(dev);
                kfree(priv->pFirmware);
                priv->pFirmware = NULL;
-       //      priv->rf_close(dev);
-//             rtl8192_SetRFPowerState(dev, eRfOff);
                rtl8192_usb_deleteendpoints(dev);
                destroy_workqueue(priv->priv_wq);
-               //rtl8192_irq_disable(dev);
-               //rtl8192_reset(dev);
                mdelay(10);
 
        }
@@ -5815,38 +5151,36 @@ static int __init rtl8192_usb_module_init(void)
 #ifdef CONFIG_IEEE80211_DEBUG
        ret = ieee80211_debug_init();
        if (ret) {
-               printk(KERN_ERR "ieee80211_debug_init() failed %d\n", ret);
+               pr_err("ieee80211_debug_init() failed %d\n", ret);
                return ret;
        }
 #endif
        ret = ieee80211_crypto_init();
        if (ret) {
-               printk(KERN_ERR "ieee80211_crypto_init() failed %d\n", ret);
+               pr_err("ieee80211_crypto_init() failed %d\n", ret);
                return ret;
        }
 
        ret = ieee80211_crypto_tkip_init();
        if (ret) {
-               printk(KERN_ERR "ieee80211_crypto_tkip_init() failed %d\n",
-                       ret);
+               pr_err("ieee80211_crypto_tkip_init() failed %d\n", ret);
                return ret;
        }
 
        ret = ieee80211_crypto_ccmp_init();
        if (ret) {
-               printk(KERN_ERR "ieee80211_crypto_ccmp_init() failed %d\n",
-                       ret);
+               pr_err("ieee80211_crypto_ccmp_init() failed %d\n", ret);
                return ret;
        }
 
        ret = ieee80211_crypto_wep_init();
        if (ret) {
-               printk(KERN_ERR "ieee80211_crypto_wep_init() failed %d\n", ret);
+               pr_err("ieee80211_crypto_wep_init() failed %d\n", ret);
                return ret;
        }
 
-       printk(KERN_INFO "\nLinux kernel driver for RTL8192 based WLAN cards\n");
-       printk(KERN_INFO "Copyright (c) 2007-2008, Realsil Wlan\n");
+       pr_info("\nLinux kernel driver for RTL8192 based WLAN cards\n");
+       pr_info("Copyright (c) 2007-2008, Realsil Wlan\n");
        RT_TRACE(COMP_INIT, "Initializing module");
        RT_TRACE(COMP_INIT, "Wireless extensions version %d", WIRELESS_EXT);
        rtl8192_proc_module_init();
@@ -5859,7 +5193,6 @@ static void __exit rtl8192_usb_module_exit(void)
        usb_deregister(&rtl8192_usb_driver);
 
        RT_TRACE(COMP_DOWN, "Exiting");
-//     rtl8192_proc_module_remove();
 }
 
 
@@ -5881,43 +5214,32 @@ void EnableHWSecurityConfig8192(struct net_device *dev)
 {
        u8 SECR_value = 0x0;
        struct r8192_priv *priv = (struct r8192_priv *)ieee80211_priv(dev);
-        struct ieee80211_device *ieee = priv->ieee80211;
+       struct ieee80211_device *ieee = priv->ieee80211;
        SECR_value = SCR_TxEncEnable | SCR_RxDecEnable;
-       if (((KEY_TYPE_WEP40 == ieee->pairwise_key_type) || (KEY_TYPE_WEP104 == ieee->pairwise_key_type)) && (priv->ieee80211->auth_mode != 2))
-       {
+       if (((KEY_TYPE_WEP40 == ieee->pairwise_key_type) || (KEY_TYPE_WEP104 == ieee->pairwise_key_type)) && (priv->ieee80211->auth_mode != 2)) {
                SECR_value |= SCR_RxUseDK;
                SECR_value |= SCR_TxUseDK;
-       }
-       else if ((ieee->iw_mode == IW_MODE_ADHOC) && (ieee->pairwise_key_type & (KEY_TYPE_CCMP | KEY_TYPE_TKIP)))
-       {
+       } else if ((ieee->iw_mode == IW_MODE_ADHOC) && (ieee->pairwise_key_type & (KEY_TYPE_CCMP | KEY_TYPE_TKIP))) {
                SECR_value |= SCR_RxUseDK;
                SECR_value |= SCR_TxUseDK;
        }
        //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
+       //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;
 
-       if ((ieee->pHTInfo->IOTAction&HT_IOT_ACT_PURE_N_MODE) || !hwwep)//!ieee->hwsec_support) //add hwsec_support flag to totol control hw_sec on/off
-       {
+       if ((ieee->pHTInfo->IOTAction&HT_IOT_ACT_PURE_N_MODE) || !hwwep) { //add hwsec_support flag to totol control hw_sec on/off
                ieee->hwsec_active = 0;
                SECR_value &= ~SCR_RxDecEnable;
        }
-       RT_TRACE(COMP_SEC, "%s:, hwsec:%d, pairwise_key:%d, SECR_value:%x\n", __func__, \
-                       ieee->hwsec_active, ieee->pairwise_key_type, SECR_value);
-       {
-               write_nic_byte(dev, SECR,  SECR_value);//SECR_value |  SCR_UseDK );
-       }
+       RT_TRACE(COMP_SEC, "%s:, hwsec:%d, pairwise_key:%d, SECR_value:%x\n", __func__,
+                ieee->hwsec_active, ieee->pairwise_key_type, SECR_value);
+       write_nic_byte(dev, SECR,  SECR_value);
 }
 
 
-void setKey(struct net_device *dev,
-           u8 EntryNo,
-           u8 KeyIndex,
-           u16 KeyType,
-           u8 *MacAddr,
-           u8 DefaultKey,
-           u32 *KeyContent)
+void setKey(struct net_device *dev, u8 EntryNo, u8 KeyIndex, u16 KeyType,
+           u8 *MacAddr, u8 DefaultKey, u32 *KeyContent)
 {
        u32 TargetCommand = 0;
        u32 TargetContent = 0;
@@ -5932,38 +5254,34 @@ void setKey(struct net_device *dev,
                usConfig |= BIT15 | (KeyType<<2);
        else
                usConfig |= BIT15 | (KeyType<<2) | KeyIndex;
-//     usConfig |= BIT15 | (KeyType<<2) | (DefaultKey<<5) | KeyIndex;
 
 
-       for (i = 0; i < CAM_CONTENT_COUNT; i++){
+       for (i = 0; i < CAM_CONTENT_COUNT; i++) {
                TargetCommand  = i+CAM_CONTENT_COUNT*EntryNo;
                TargetCommand |= BIT31|BIT16;
 
-               if (i == 0){//MAC|Config
+               if (i == 0) { //MAC|Config
                        TargetContent = (u32)(*(MacAddr+0)) << 16|
                                        (u32)(*(MacAddr+1)) << 24|
                                        (u32)usConfig;
 
                        write_nic_dword(dev, WCAMI, TargetContent);
                        write_nic_dword(dev, RWCAM, TargetCommand);
-       //              printk("setkey cam =%8x\n", read_cam(dev, i+6*EntryNo));
-               }
-               else if (i == 1){//MAC
+               } 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);
-               }
-               else {
+               } else {
                        //Key Material
-                       if (KeyContent != NULL){
-                       write_nic_dword(dev, WCAMI, (u32)(*(KeyContent+i-2)));
-                       write_nic_dword(dev, RWCAM, TargetCommand);
+                       if (KeyContent != NULL) {
+                               write_nic_dword(dev, WCAMI, (u32)(*(KeyContent+i-2)));
+                               write_nic_dword(dev, RWCAM, TargetCommand);
+                       }
                }
        }
-       }
 
 }