Merge branch 'for-2.6.31' of git://git.linux-nfs.org/projects/trondmy/nfs-2.6
[pandora-kernel.git] / drivers / staging / rt2860 / rt_main_dev.c
index 95965a2..f298b9b 100644 (file)
@@ -54,13 +54,13 @@ MODULE_PARM_DESC (mac, "rt28xx: wireless mac addr");
 /*---------------------------------------------------------------------*/
 /* Prototypes of Functions Used                                        */
 /*---------------------------------------------------------------------*/
-#ifdef DOT11_N_SUPPORT
 extern BOOLEAN ba_reordering_resource_init(PRTMP_ADAPTER pAd, int num);
 extern void ba_reordering_resource_release(PRTMP_ADAPTER pAd);
-#endif // DOT11_N_SUPPORT //
 extern NDIS_STATUS NICLoadRateSwitchingParams(IN PRTMP_ADAPTER pAd);
 
+#ifdef RT2860
 extern void init_thread_task(PRTMP_ADAPTER pAd);
+#endif
 
 // public function prototype
 INT __devinit rt28xx_probe(IN void *_dev_p, IN void *_dev_id_p,
@@ -72,9 +72,7 @@ INT rt28xx_send_packets(IN struct sk_buff *skb_p, IN struct net_device *net_dev)
 
 static void CfgInitHook(PRTMP_ADAPTER pAd);
 
-#ifdef CONFIG_STA_SUPPORT
 extern const struct iw_handler_def rt28xx_iw_handler_def;
-#endif // CONFIG_STA_SUPPORT //
 
 #if WIRELESS_EXT >= 12
 // This function will be called when query /proc
@@ -191,6 +189,12 @@ int rt28xx_close(IN PNET_DEV dev)
     RTMP_ADAPTER       *pAd = net_dev->ml_priv;
        BOOLEAN                 Cancelled = FALSE;
        UINT32                  i = 0;
+#ifdef RT2870
+       DECLARE_WAIT_QUEUE_HEAD(unlink_wakeup);
+       DECLARE_WAITQUEUE(wait, current);
+
+       //RTMP_SET_FLAG(pAd, fRTMP_ADAPTER_REMOVE_IN_PROGRESS);
+#endif // RT2870 //
 
 
     DBGPRINT(RT_DEBUG_TRACE, ("===> rt28xx_close\n"));
@@ -199,49 +203,26 @@ int rt28xx_close(IN PNET_DEV dev)
        if (pAd == NULL)
                return 0; // close ok
 
-#ifdef CONFIG_STA_SUPPORT
-       IF_DEV_CONFIG_OPMODE_ON_STA(pAd)
        {
                // If dirver doesn't wake up firmware here,
                // NICLoadFirmware will hang forever when interface is up again.
+#ifdef RT2860
                if (OPSTATUS_TEST_FLAG(pAd, fOP_STATUS_DOZE) ||
                        RTMP_SET_PSFLAG(pAd, fRTMP_PS_SET_PCI_CLK_OFF_COMMAND) ||
                        RTMP_TEST_FLAG(pAd, fRTMP_ADAPTER_IDLE_RADIO_OFF))
+#endif
+#ifdef RT2870
+               if (OPSTATUS_TEST_FLAG(pAd, fOP_STATUS_DOZE))
+#endif
         {
+#ifdef RT2860
                    AsicForceWakeup(pAd, RTMP_HALT);
+#endif
+#ifdef RT2870
+                   AsicForceWakeup(pAd, TRUE);
+#endif
         }
 
-#ifdef QOS_DLS_SUPPORT
-               // send DLS-TEAR_DOWN message,
-               if (pAd->CommonCfg.bDLSCapable)
-               {
-                       UCHAR i;
-
-                       // tear down local dls table entry
-                       for (i=0; i<MAX_NUM_OF_INIT_DLS_ENTRY; i++)
-                       {
-                               if (pAd->StaCfg.DLSEntry[i].Valid && (pAd->StaCfg.DLSEntry[i].Status == DLS_FINISH))
-                               {
-                                       RTMPSendDLSTearDownFrame(pAd, pAd->StaCfg.DLSEntry[i].MacAddr);
-                                       pAd->StaCfg.DLSEntry[i].Status  = DLS_NONE;
-                                       pAd->StaCfg.DLSEntry[i].Valid   = FALSE;
-                               }
-                       }
-
-                       // tear down peer dls table entry
-                       for (i=MAX_NUM_OF_INIT_DLS_ENTRY; i<MAX_NUM_OF_DLS_ENTRY; i++)
-                       {
-                               if (pAd->StaCfg.DLSEntry[i].Valid && (pAd->StaCfg.DLSEntry[i].Status == DLS_FINISH))
-                               {
-                                       RTMPSendDLSTearDownFrame(pAd, pAd->StaCfg.DLSEntry[i].MacAddr);
-                                       pAd->StaCfg.DLSEntry[i].Status = DLS_NONE;
-                                       pAd->StaCfg.DLSEntry[i].Valid   = FALSE;
-                               }
-                       }
-                       RT28XX_MLME_HANDLER(pAd);
-               }
-#endif // QOS_DLS_SUPPORT //
-
                if (INFRA_ON(pAd) &&
                        (!RTMP_TEST_FLAG(pAd, fRTMP_ADAPTER_NIC_NOT_EXIST)))
                {
@@ -267,6 +248,9 @@ int rt28xx_close(IN PNET_DEV dev)
                        RTMPusecDelay(1000);
                }
 
+#ifdef RT2870
+       RTMP_SET_FLAG(pAd, fRTMP_ADAPTER_REMOVE_IN_PROGRESS);
+#endif // RT2870 //
 
 #ifdef CCX_SUPPORT
                RTMPCancelTimer(&pAd->StaCfg.LeapAuthTimer, &Cancelled);
@@ -275,22 +259,11 @@ int rt28xx_close(IN PNET_DEV dev)
                RTMPCancelTimer(&pAd->StaCfg.StaQuickResponeForRateUpTimer, &Cancelled);
                RTMPCancelTimer(&pAd->StaCfg.WpaDisassocAndBlockAssocTimer, &Cancelled);
 
-#ifdef WPA_SUPPLICANT_SUPPORT
-#ifndef NATIVE_WPA_SUPPLICANT_SUPPORT
-               {
-                       union iwreq_data    wrqu;
-                       // send wireless event to wpa_supplicant for infroming interface down.
-                       memset(&wrqu, 0, sizeof(wrqu));
-                       wrqu.data.flags = RT_INTERFACE_DOWN;
-                       wireless_send_event(pAd->net_dev, IWEVCUSTOM, &wrqu, NULL);
-               }
-#endif // NATIVE_WPA_SUPPLICANT_SUPPORT //
-#endif // WPA_SUPPLICANT_SUPPORT //
-
                MlmeRadioOff(pAd);
+#ifdef RT2860
                pAd->bPCIclkOff = FALSE;
+#endif
        }
-#endif // CONFIG_STA_SUPPORT //
 
        RTMP_SET_FLAG(pAd, fRTMP_ADAPTER_HALT_IN_PROGRESS);
 
@@ -303,25 +276,52 @@ int rt28xx_close(IN PNET_DEV dev)
                }
        }
 
+#ifdef RT2870
+       // ensure there are no more active urbs.
+       add_wait_queue (&unlink_wakeup, &wait);
+       pAd->wait = &unlink_wakeup;
+
+       // maybe wait for deletions to finish.
+       i = 0;
+       //while((i < 25) && atomic_read(&pAd->PendingRx) > 0)
+       while(i < 25)
+       {
+               unsigned long IrqFlags;
+
+               RTMP_IRQ_LOCK(&pAd->BulkInLock, IrqFlags);
+               if (pAd->PendingRx == 0)
+               {
+                       RTMP_IRQ_UNLOCK(&pAd->BulkInLock, IrqFlags);
+                       break;
+               }
+               RTMP_IRQ_UNLOCK(&pAd->BulkInLock, IrqFlags);
+
+               msleep(UNLINK_TIMEOUT_MS);      //Time in millisecond
+               i++;
+       }
+       pAd->wait = NULL;
+       remove_wait_queue (&unlink_wakeup, &wait);
+#endif // RT2870 //
+
+#ifdef RT2870
+       // We need clear timerQ related structure before exits of the timer thread.
+       RT2870_TimerQ_Exit(pAd);
+       // Close kernel threads or tasklets
+       RT28xxThreadTerminate(pAd);
+#endif // RT2870 //
+
        // Stop Mlme state machine
        MlmeHalt(pAd);
 
        // Close kernel threads or tasklets
        kill_thread_task(pAd);
 
-
-#ifdef CONFIG_STA_SUPPORT
-       IF_DEV_CONFIG_OPMODE_ON_STA(pAd)
-       {
-               MacTableReset(pAd);
-       }
-#endif // CONFIG_STA_SUPPORT //
-
+       MacTableReset(pAd);
 
        MeasureReqTabExit(pAd);
        TpcReqTabExit(pAd);
 
-
+#ifdef RT2860
        if (RTMP_TEST_FLAG(pAd, fRTMP_ADAPTER_INTERRUPT_ACTIVE))
        {
                NICDisableInterrupt(pAd);
@@ -337,18 +337,15 @@ int rt28xx_close(IN PNET_DEV dev)
                RT28XX_IRQ_RELEASE(net_dev)
                RTMP_CLEAR_FLAG(pAd, fRTMP_ADAPTER_INTERRUPT_IN_USE);
        }
-
+#endif
 
        // Free Ring or USB buffers
        RTMPFreeTxRxRingMemory(pAd);
 
        RTMP_CLEAR_FLAG(pAd, fRTMP_ADAPTER_HALT_IN_PROGRESS);
 
-#ifdef DOT11_N_SUPPORT
        // Free BA reorder resource
        ba_reordering_resource_release(pAd);
-#endif // DOT11_N_SUPPORT //
-
 
        RTMP_CLEAR_FLAG(pAd, fRTMP_ADAPTER_START_UP);
 
@@ -357,17 +354,19 @@ int rt28xx_close(IN PNET_DEV dev)
 
 static int rt28xx_init(IN struct net_device *net_dev)
 {
+#ifdef RT2860
        PRTMP_ADAPTER                   pAd = (PRTMP_ADAPTER)net_dev->ml_priv;
+#endif
+#ifdef RT2870
+       PRTMP_ADAPTER                   pAd = net_dev->ml_priv;
+#endif
        UINT                                    index;
        UCHAR                                   TmpPhy;
        NDIS_STATUS                             Status;
        UINT32          MacCsr0 = 0;
 
-
-#ifdef DOT11_N_SUPPORT
        // Allocate BA Reordering memory
        ba_reordering_resource_init(pAd, MAX_REORDERING_MPDU_NUM);
-#endif // DOT11_N_SUPPORT //
 
        // Make sure MAC gets ready.
        index = 0;
@@ -383,11 +382,11 @@ static int rt28xx_init(IN struct net_device *net_dev)
        } while (index++ < 100);
 
        DBGPRINT(RT_DEBUG_TRACE, ("MAC_CSR0  [ Ver:Rev=0x%08x]\n", pAd->MACVersion));
+/*Iverson patch PCIE L1 issue */
 
        // Disable DMA
        RT28XXDMADisable(pAd);
 
-
        // Load 8051 firmware
        Status = NICLoadFirmware(pAd);
        if (Status != NDIS_STATUS_SUCCESS)
@@ -400,10 +399,12 @@ static int rt28xx_init(IN struct net_device *net_dev)
 
        // Disable interrupts here which is as soon as possible
        // This statement should never be true. We might consider to remove it later
+#ifdef RT2860
        if (RTMP_TEST_FLAG(pAd, fRTMP_ADAPTER_INTERRUPT_ACTIVE))
        {
                NICDisableInterrupt(pAd);
        }
+#endif
 
        Status = RTMPAllocTxRxRingMemory(pAd);
        if (Status != NDIS_STATUS_SUCCESS)
@@ -428,6 +429,10 @@ static int rt28xx_init(IN struct net_device *net_dev)
        //
        UserCfgInit(pAd);
 
+#ifdef RT2870
+       // We need init timerQ related structure before create the timer thread.
+       RT2870_TimerQ_Init(pAd);
+#endif // RT2870 //
 
        RT28XX_TASK_THREAD_INIT(pAd, Status);
        if (Status != NDIS_STATUS_SUCCESS)
@@ -435,10 +440,7 @@ static int rt28xx_init(IN struct net_device *net_dev)
 
        CfgInitHook(pAd);
 
-#ifdef CONFIG_STA_SUPPORT
-       IF_DEV_CONFIG_OPMODE_ON_STA(pAd)
-               NdisAllocateSpinLock(&pAd->MacTabLock);
-#endif // CONFIG_STA_SUPPORT //
+       NdisAllocateSpinLock(&pAd->MacTabLock);
 
        MeasureReqTabInit(pAd);
        TpcReqTabInit(pAd);
@@ -464,10 +466,17 @@ static int rt28xx_init(IN struct net_device *net_dev)
                goto err4;
        }
 
+#ifdef RT2870
+       pAd->CommonCfg.bMultipleIRP = FALSE;
+
+       if (pAd->CommonCfg.bMultipleIRP)
+               pAd->CommonCfg.NumOfBulkInIRP = RX_RING_SIZE;
+       else
+               pAd->CommonCfg.NumOfBulkInIRP = 1;
+#endif // RT2870 //
 
 
        //Init Ba Capability parameters.
-#ifdef DOT11_N_SUPPORT
        pAd->CommonCfg.DesiredHtPhy.MpduDensity = (UCHAR)pAd->CommonCfg.BACapability.field.MpduDensity;
        pAd->CommonCfg.DesiredHtPhy.AmsduEnable = (USHORT)pAd->CommonCfg.BACapability.field.AmsduEnable;
        pAd->CommonCfg.DesiredHtPhy.AmsduSize = (USHORT)pAd->CommonCfg.BACapability.field.AmsduSize;
@@ -476,7 +485,6 @@ static int rt28xx_init(IN struct net_device *net_dev)
        pAd->CommonCfg.HtCapability.HtCapInfo.MimoPs = (USHORT)pAd->CommonCfg.BACapability.field.MMPSmode;
        pAd->CommonCfg.HtCapability.HtCapInfo.AMsduSize = (USHORT)pAd->CommonCfg.BACapability.field.AmsduSize;
        pAd->CommonCfg.HtCapability.HtCapParm.MpduDensity = (UCHAR)pAd->CommonCfg.BACapability.field.MpduDensity;
-#endif // DOT11_N_SUPPORT //
 
        printk("2. Phy Mode = %d\n", pAd->CommonCfg.PhyMode);
 
@@ -491,9 +499,7 @@ static int rt28xx_init(IN struct net_device *net_dev)
        TmpPhy = pAd->CommonCfg.PhyMode;
        pAd->CommonCfg.PhyMode = 0xff;
        RTMPSetPhyMode(pAd, TmpPhy);
-#ifdef DOT11_N_SUPPORT
        SetCommonHT(pAd);
-#endif // DOT11_N_SUPPORT //
 
        // No valid channels.
        if (pAd->ChannelListNum == 0)
@@ -502,11 +508,14 @@ static int rt28xx_init(IN struct net_device *net_dev)
                goto err4;
        }
 
-#ifdef DOT11_N_SUPPORT
        printk("MCS Set = %02x %02x %02x %02x %02x\n", pAd->CommonCfg.HtCapability.MCSSet[0],
            pAd->CommonCfg.HtCapability.MCSSet[1], pAd->CommonCfg.HtCapability.MCSSet[2],
            pAd->CommonCfg.HtCapability.MCSSet[3], pAd->CommonCfg.HtCapability.MCSSet[4]);
-#endif // DOT11_N_SUPPORT //
+
+#ifdef RT2870
+    //Init RT30xx RFRegisters after read RFIC type from EEPROM
+       NICInitRT30xxRFRegisters(pAd);
+#endif // RT2870 //
 
 #ifdef IKANOS_VX_1X0
        VR_IKANOS_FP_Init(pAd->ApCfg.BssidNum, pAd->PermanentAddress);
@@ -518,8 +527,10 @@ static int rt28xx_init(IN struct net_device *net_dev)
        AsicSwitchChannel(pAd, pAd->CommonCfg.Channel, FALSE);
        AsicLockChannel(pAd, pAd->CommonCfg.Channel);
 
+#ifndef RT30xx
        // 8051 firmware require the signal during booting time.
        AsicSendCommandToMcu(pAd, 0x72, 0xFF, 0x00, 0x00);
+#endif
 
        if (pAd && (Status != NDIS_STATUS_SUCCESS))
        {
@@ -536,9 +547,24 @@ static int rt28xx_init(IN struct net_device *net_dev)
                // Microsoft HCT require driver send a disconnect event after driver initialization.
                OPSTATUS_CLEAR_FLAG(pAd, fOP_STATUS_MEDIA_STATE_CONNECTED);
                RTMP_SET_FLAG(pAd, fRTMP_ADAPTER_MEDIA_STATE_CHANGE);
+
                DBGPRINT(RT_DEBUG_TRACE, ("NDIS_STATUS_MEDIA_DISCONNECT Event B!\n"));
 
 
+#ifdef RT2870
+               RTMP_CLEAR_FLAG(pAd, fRTMP_ADAPTER_RESET_IN_PROGRESS);
+               RTMP_CLEAR_FLAG(pAd, fRTMP_ADAPTER_REMOVE_IN_PROGRESS);
+
+               //
+               // Support multiple BulkIn IRP,
+               // the value on pAd->CommonCfg.NumOfBulkInIRP may be large than 1.
+               //
+               for(index=0; index<pAd->CommonCfg.NumOfBulkInIRP; index++)
+               {
+                       RTUSBBulkReceive(pAd);
+                       DBGPRINT(RT_DEBUG_TRACE, ("RTUSBBulkReceive!\n" ));
+               }
+#endif // RT2870 //
        }// end of else
 
 
@@ -553,17 +579,12 @@ err3:
 err2:
        RTMPFreeTxRxRingMemory(pAd);
 err1:
-
-#ifdef DOT11_N_SUPPORT
        os_free_mem(pAd, pAd->mpdu_blk_pool.mem); // free BA pool
-#endif // DOT11_N_SUPPORT //
        RT28XX_IRQ_RELEASE(net_dev);
 
        // shall not set ml_priv to NULL here because the ml_priv didn't been free yet.
        //net_dev->ml_priv = 0;
-#ifdef INF_AMAZON_SE
-err0:
-#endif // INF_AMAZON_SE //
+
        printk("!!! %s Initialized fail !!!\n", RT28xx_CHIP_NAME);
        return FALSE;
 } /* End of rt28xx_init */
@@ -618,13 +639,8 @@ int rt28xx_open(IN PNET_DEV dev)
        if (rt28xx_init(net_dev) == FALSE)
                goto err;
 
-#ifdef CONFIG_STA_SUPPORT
-       IF_DEV_CONFIG_OPMODE_ON_STA(pAd)
-       {
-               NdisZeroMemory(pAd->StaCfg.dev_name, 16);
-               NdisMoveMemory(pAd->StaCfg.dev_name, net_dev->name, strlen(net_dev->name));
-       }
-#endif // CONFIG_STA_SUPPORT //
+       NdisZeroMemory(pAd->StaCfg.dev_name, 16);
+       NdisMoveMemory(pAd->StaCfg.dev_name, net_dev->name, strlen(net_dev->name));
 
        // Set up the Mac address
        NdisMoveMemory(net_dev->dev_addr, (void *) pAd->CurrentAddress, 6);
@@ -634,24 +650,6 @@ int rt28xx_open(IN PNET_DEV dev)
 
        // Various AP function init
 
-#ifdef CONFIG_STA_SUPPORT
-       IF_DEV_CONFIG_OPMODE_ON_STA(pAd)
-       {
-#ifdef WPA_SUPPLICANT_SUPPORT
-#ifndef NATIVE_WPA_SUPPLICANT_SUPPORT
-               {
-                       union iwreq_data    wrqu;
-                       // send wireless event to wpa_supplicant for infroming interface down.
-                       memset(&wrqu, 0, sizeof(wrqu));
-                       wrqu.data.flags = RT_INTERFACE_UP;
-                       wireless_send_event(pAd->net_dev, IWEVCUSTOM, &wrqu, NULL);
-               }
-#endif // NATIVE_WPA_SUPPLICANT_SUPPORT //
-#endif // WPA_SUPPLICANT_SUPPORT //
-
-       }
-#endif // CONFIG_STA_SUPPORT //
-
        // Enable Interrupt
        RT28XX_IRQ_ENABLE(pAd);
 
@@ -665,11 +663,9 @@ int rt28xx_open(IN PNET_DEV dev)
        printk("0x1300 = %08x\n", reg);
        }
 
-#ifdef CONFIG_STA_SUPPORT
-       IF_DEV_CONFIG_OPMODE_ON_STA(pAd)
+#ifdef RT2860
         RTMPInitPCIeLinkCtrlValue(pAd);
-#endif // CONFIG_STA_SUPPORT //
-
+#endif
        return (retval);
 
 err:
@@ -699,17 +695,12 @@ static NDIS_STATUS rt_ieee80211_if_setup(struct net_device *dev, PRTMP_ADAPTER p
        CHAR    slot_name[IFNAMSIZ];
        struct net_device   *device;
 
-
-       //ether_setup(dev);
-
-#ifdef CONFIG_STA_SUPPORT
 #if WIRELESS_EXT >= 12
        if (pAd->OpMode == OPMODE_STA)
        {
                dev->wireless_handlers = &rt28xx_iw_handler_def;
        }
 #endif //WIRELESS_EXT >= 12
-#endif // CONFIG_STA_SUPPORT //
 
 #if WIRELESS_EXT < 21
                dev->get_wireless_stats = rt28xx_get_wireless_stats;
@@ -770,12 +761,17 @@ INT __devinit   rt28xx_probe(
     PRTMP_ADAPTER       pAd = (PRTMP_ADAPTER) NULL;
     INT                 status;
        PVOID                           handle;
+#ifdef RT2860
        struct pci_dev *dev_p = (struct pci_dev *)_dev_p;
+#endif
+#ifdef RT2870
+       struct usb_interface *intf = (struct usb_interface *)_dev_p;
+       struct usb_device *dev_p = interface_to_usbdev(intf);
 
+       dev_p = usb_get_dev(dev_p);
+#endif // RT2870 //
 
-#ifdef CONFIG_STA_SUPPORT
     DBGPRINT(RT_DEBUG_TRACE, ("STA Driver version-%s\n", STA_DRIVER_VERSION));
-#endif // CONFIG_STA_SUPPORT //
 
     net_dev = alloc_etherdev(sizeof(PRTMP_ADAPTER));
     if (net_dev == NULL)
@@ -786,13 +782,12 @@ INT __devinit   rt28xx_probe(
     }
 
        netif_stop_queue(net_dev);
-#ifdef NATIVE_WPA_SUPPLICANT_SUPPORT
+
 /* for supporting Network Manager */
 /* Set the sysfs physical device reference for the network logical device
  * if set prior to registration will cause a symlink during initialization.
  */
     SET_NETDEV_DEV(net_dev, &(dev_p->dev));
-#endif // NATIVE_WPA_SUPPLICANT_SUPPORT //
 
        // Allocate RTMP_ADAPTER miniport adapter structure
        handle = kmalloc(sizeof(struct os_cookie), GFP_KERNEL);
@@ -807,17 +802,13 @@ INT __devinit   rt28xx_probe(
 
        RT28XXNetDevInit(_dev_p, net_dev, pAd);
 
-#ifdef CONFIG_STA_SUPPORT
     pAd->StaCfg.OriDevType = net_dev->type;
-#endif // CONFIG_STA_SUPPORT //
 
        // Post config
        if (RT28XXProbePostConfig(_dev_p, pAd, 0) == FALSE)
                goto err_out_unmap;
 
-#ifdef CONFIG_STA_SUPPORT
        pAd->OpMode = OPMODE_STA;
-#endif // CONFIG_STA_SUPPORT //
 
        // sample move
        if (rt_ieee80211_if_setup(net_dev, pAd) != NDIS_STATUS_SUCCESS)
@@ -874,8 +865,6 @@ int rt28xx_packet_xmit(struct sk_buff *skb)
        int status = 0;
        PNDIS_PACKET pPacket = (PNDIS_PACKET) skb;
 
-#ifdef CONFIG_STA_SUPPORT
-       IF_DEV_CONFIG_OPMODE_ON_STA(pAd)
        {
                // Drop send request since we are in monitor mode
                if (MONITOR_ON(pAd))
@@ -884,7 +873,6 @@ int rt28xx_packet_xmit(struct sk_buff *skb)
                        goto done;
                }
        }
-#endif // CONFIG_STA_SUPPORT //
 
         // EapolStart size is 18
        if (skb->len < 14)
@@ -902,16 +890,7 @@ int rt28xx_packet_xmit(struct sk_buff *skb)
     }
 #endif
 
-
-
-#ifdef CONFIG_STA_SUPPORT
-       IF_DEV_CONFIG_OPMODE_ON_STA(pAd)
-       {
-
-               STASendPackets((NDIS_HANDLE)pAd, (PPNDIS_PACKET) &pPacket, 1);
-       }
-
-#endif // CONFIG_STA_SUPPORT //
+       STASendPackets((NDIS_HANDLE)pAd, (PPNDIS_PACKET) &pPacket, 1);
 
        status = 0;
 done:
@@ -980,10 +959,8 @@ struct iw_statistics *rt28xx_get_wireless_stats(
        if(pAd->iw_stats.qual.qual > 100)
                pAd->iw_stats.qual.qual = 100;
 
-#ifdef CONFIG_STA_SUPPORT
        if (pAd->OpMode == OPMODE_STA)
                pAd->iw_stats.qual.level = RTMPMaxRssi(pAd, pAd->StaCfg.RssiSample.LastRssi0, pAd->StaCfg.RssiSample.LastRssi1, pAd->StaCfg.RssiSample.LastRssi2);
-#endif // CONFIG_STA_SUPPORT //
 
        pAd->iw_stats.qual.noise = pAd->BbpWriteLatch[66]; // noise level (dBm)
 
@@ -1035,13 +1012,7 @@ INT rt28xx_ioctl(
                return -ENETDOWN;
        }
 
-
-#ifdef CONFIG_STA_SUPPORT
-       IF_DEV_CONFIG_OPMODE_ON_STA(pAd)
-       {
-               ret = rt28xx_sta_ioctl(net_dev, rq, cmd);
-       }
-#endif // CONFIG_STA_SUPPORT //
+       ret = rt28xx_sta_ioctl(net_dev, rq, cmd);
 
        return ret;
 }