diff options
Diffstat (limited to 'drivers/staging/rt3070/rt_linux.h')
-rw-r--r-- | drivers/staging/rt3070/rt_linux.h | 13 |
1 files changed, 0 insertions, 13 deletions
diff --git a/drivers/staging/rt3070/rt_linux.h b/drivers/staging/rt3070/rt_linux.h index 6c34b0b5537..d2a1b9728a9 100644 --- a/drivers/staging/rt3070/rt_linux.h +++ b/drivers/staging/rt3070/rt_linux.h | |||
@@ -88,8 +88,6 @@ typedef int (*HARD_START_XMIT_FUNC)(struct sk_buff *skb, struct net_device *net_ | |||
88 | 88 | ||
89 | // add by kathy | 89 | // add by kathy |
90 | 90 | ||
91 | #ifdef CONFIG_STA_SUPPORT | ||
92 | |||
93 | #ifdef RT2870 | 91 | #ifdef RT2870 |
94 | #define STA_PROFILE_PATH "/etc/Wireless/RT2870STA/RT2870STA.dat" | 92 | #define STA_PROFILE_PATH "/etc/Wireless/RT2870STA/RT2870STA.dat" |
95 | #define STA_RT2870_IMAGE_FILE_NAME "/etc/Wireless/RT2870STA/rt2870.bin" | 93 | #define STA_RT2870_IMAGE_FILE_NAME "/etc/Wireless/RT2870STA/rt2870.bin" |
@@ -97,9 +95,6 @@ typedef int (*HARD_START_XMIT_FUNC)(struct sk_buff *skb, struct net_device *net_ | |||
97 | #define STA_DRIVER_VERSION "2.0.1.0" | 95 | #define STA_DRIVER_VERSION "2.0.1.0" |
98 | #endif // RT2870 // | 96 | #endif // RT2870 // |
99 | 97 | ||
100 | #endif // CONFIG_STA_SUPPORT // | ||
101 | |||
102 | |||
103 | #define RTMP_TIME_AFTER(a,b) \ | 98 | #define RTMP_TIME_AFTER(a,b) \ |
104 | (typecheck(unsigned long, (unsigned long)a) && \ | 99 | (typecheck(unsigned long, (unsigned long)a) && \ |
105 | typecheck(unsigned long, (unsigned long)b) && \ | 100 | typecheck(unsigned long, (unsigned long)b) && \ |
@@ -138,17 +133,12 @@ typedef int (*HARD_START_XMIT_FUNC)(struct sk_buff *skb, struct net_device *net_ | |||
138 | #define MIN_NET_DEVICE_FOR_WDS 0x10 //0x40,0x50,0x60,0x70 | 133 | #define MIN_NET_DEVICE_FOR_WDS 0x10 //0x40,0x50,0x60,0x70 |
139 | #define MIN_NET_DEVICE_FOR_APCLI 0x20 | 134 | #define MIN_NET_DEVICE_FOR_APCLI 0x20 |
140 | #define MIN_NET_DEVICE_FOR_MESH 0x30 | 135 | #define MIN_NET_DEVICE_FOR_MESH 0x30 |
141 | #ifdef CONFIG_STA_SUPPORT | ||
142 | #define MIN_NET_DEVICE_FOR_DLS 0x40 | 136 | #define MIN_NET_DEVICE_FOR_DLS 0x40 |
143 | #endif // CONFIG_STA_SUPPORT // | ||
144 | 137 | ||
145 | |||
146 | #ifdef CONFIG_STA_SUPPORT | ||
147 | #define NDIS_PACKET_TYPE_DIRECTED 0 | 138 | #define NDIS_PACKET_TYPE_DIRECTED 0 |
148 | #define NDIS_PACKET_TYPE_MULTICAST 1 | 139 | #define NDIS_PACKET_TYPE_MULTICAST 1 |
149 | #define NDIS_PACKET_TYPE_BROADCAST 2 | 140 | #define NDIS_PACKET_TYPE_BROADCAST 2 |
150 | #define NDIS_PACKET_TYPE_ALL_MULTICAST 3 | 141 | #define NDIS_PACKET_TYPE_ALL_MULTICAST 3 |
151 | #endif // CONFIG_STA_SUPPORT // | ||
152 | 142 | ||
153 | struct os_lock { | 143 | struct os_lock { |
154 | spinlock_t lock; | 144 | spinlock_t lock; |
@@ -513,8 +503,6 @@ DECLARE_TIMER_FUNCTION(AsicRfTuningExec); | |||
513 | DECLARE_TIMER_FUNCTION(BeaconUpdateExec); | 503 | DECLARE_TIMER_FUNCTION(BeaconUpdateExec); |
514 | #endif // RT2870 // | 504 | #endif // RT2870 // |
515 | 505 | ||
516 | |||
517 | #ifdef CONFIG_STA_SUPPORT | ||
518 | DECLARE_TIMER_FUNCTION(BeaconTimeout); | 506 | DECLARE_TIMER_FUNCTION(BeaconTimeout); |
519 | DECLARE_TIMER_FUNCTION(ScanTimeout); | 507 | DECLARE_TIMER_FUNCTION(ScanTimeout); |
520 | DECLARE_TIMER_FUNCTION(AuthTimeout); | 508 | DECLARE_TIMER_FUNCTION(AuthTimeout); |
@@ -526,7 +514,6 @@ DECLARE_TIMER_FUNCTION(StaQuickResponeForRateUpExec); | |||
526 | DECLARE_TIMER_FUNCTION(WpaDisassocApAndBlockAssoc); | 514 | DECLARE_TIMER_FUNCTION(WpaDisassocApAndBlockAssoc); |
527 | DECLARE_TIMER_FUNCTION(PsPollWakeExec); | 515 | DECLARE_TIMER_FUNCTION(PsPollWakeExec); |
528 | DECLARE_TIMER_FUNCTION(RadioOnExec); | 516 | DECLARE_TIMER_FUNCTION(RadioOnExec); |
529 | #endif // CONFIG_STA_SUPPORT // | ||
530 | 517 | ||
531 | void RTMP_GetCurrentSystemTime(LARGE_INTEGER *time); | 518 | void RTMP_GetCurrentSystemTime(LARGE_INTEGER *time); |
532 | 519 | ||