summaryrefslogtreecommitdiff
path: root/drivers/staging/rt3070/2870_main_dev.c
diff options
context:
space:
mode:
authorBartlomiej Zolnierkiewicz <bzolnier@gmail.com>2009-04-26 18:05:49 +0400
committerGreg Kroah-Hartman <gregkh@suse.de>2009-06-19 22:00:47 +0400
commit84717059b36187025c6483566de6873661787c74 (patch)
treead52a5cb4c1d8a77f68150ea2b4550799aec30ef /drivers/staging/rt3070/2870_main_dev.c
parentbc05b159c5a7db29e38890ff1ad4b07a586896cf (diff)
downloadlinux-84717059b36187025c6483566de6873661787c74.tar.xz
Staging: rt3070: remove CONFIG_STA_SUPPORT ifdefs
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/rt3070/2870_main_dev.c')
-rw-r--r--drivers/staging/rt3070/2870_main_dev.c13
1 files changed, 0 insertions, 13 deletions
diff --git a/drivers/staging/rt3070/2870_main_dev.c b/drivers/staging/rt3070/2870_main_dev.c
index 1783811b92c0..667a26650399 100644
--- a/drivers/staging/rt3070/2870_main_dev.c
+++ b/drivers/staging/rt3070/2870_main_dev.c
@@ -46,12 +46,10 @@
// Otherwise post to forum in ralinktech's web site(www.ralinktech.com) and let all users help you. ***
MODULE_AUTHOR("Paul Lin <paul_lin@ralinktech.com>");
MODULE_DESCRIPTION("RT2870 Wireless Lan Linux Driver");
-#ifdef CONFIG_STA_SUPPORT
MODULE_LICENSE("GPL");
#ifdef MODULE_VERSION
MODULE_VERSION(STA_DRIVER_VERSION);
#endif
-#endif // CONFIG_STA_SUPPORT //
/* Kernel thread and vars, which handles packets that are completed. Only
* packets that have a "complete" function are sent here. This way, the
@@ -614,7 +612,6 @@ VOID RT2870_WatchDog(IN RTMP_ADAPTER *pAd)
}
//PS packets use HCCA queue when dequeue from PS unicast queue (WiFi WPA2 MA9_DT1 for Marvell B STA)
-#ifdef CONFIG_STA_SUPPORT
IF_DEV_CONFIG_OPMODE_ON_STA(pAd)
{
idx = 0;
@@ -630,7 +627,6 @@ VOID RT2870_WatchDog(IN RTMP_ADAPTER *pAd)
RTMP_IO_WRITE32(pAd, PBF_CFG, 0xf40006);
}
}
-#endif // CONFIG_STA_SUPPORT //
if (pAd->watchDogRxOverFlowCnt >= 2)
{
@@ -1318,13 +1314,10 @@ VOID RT2870_BssBeaconStop(
{
INT NumOfBcn;
-
-#ifdef CONFIG_STA_SUPPORT
IF_DEV_CONFIG_OPMODE_ON_STA(pAd)
{
NumOfBcn = MAX_MESH_NUM;
}
-#endif // CONFIG_STA_SUPPORT //
RTMPCancelTimer(&pAd->CommonCfg.BeaconUpdateTimer, &Cancelled);
@@ -1357,22 +1350,16 @@ VOID RT2870_BssBeaconStart(
{
INT NumOfBcn;
-
-#ifdef CONFIG_STA_SUPPORT
IF_DEV_CONFIG_OPMODE_ON_STA(pAd)
{
NumOfBcn = MAX_MESH_NUM;
}
-#endif // CONFIG_STA_SUPPORT //
for(apidx=0; apidx<NumOfBcn; apidx++)
{
UCHAR CapabilityInfoLocationInBeacon = 0;
UCHAR TimIELocationInBeacon = 0;
-#ifdef CONFIG_STA_SUPPORT
-#endif // CONFIG_STA_SUPPORT //
-
NdisZeroMemory(pBeaconSync->BeaconBuf[apidx], HW_BEACON_OFFSET);
pBeaconSync->CapabilityInfoLocationInBeacon[apidx] = CapabilityInfoLocationInBeacon;
pBeaconSync->TimIELocationInBeacon[apidx] = TimIELocationInBeacon;