OpenE2K
/
linux
6
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Staging: rtl8187se: remove THOMAS_TURBO ifdefs 

Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
Bartlomiej Zolnierkiewicz 2009-06-28 16:18:57 +02:00 committed by Greg Kroah-Hartman
parent 2e0baea977
commit 9a5aabffd1
5 changed files with 0 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
drivers/staging/rtl8187se/Makefile
View File

@ -4,7 +4,6 @@
#EXTRA_CFLAGS += -std=gnu89
#EXTRA_CFLAGS += -O2
#CC = gcc
EXTRA_CFLAGS += -DTHOMAS_TURBO
#CFLAGS += -DCONFIG_RTL8185B
#CFLAGS += -DCONFIG_RTL818x_S

2
drivers/staging/rtl8187se/ieee80211/ieee80211.h
View File

@ -956,9 +956,7 @@ struct ieee80211_network {
//by amy 080312
u8 HighestOperaRate;
//by amy 080312
#ifdef THOMAS_TURBO
u8 Turbo_Enable;//enable turbo mode, added by thomas
#endif
u16 CountryIeLen;
u8 CountryIeBuf[MAX_IE_LEN];
};

6
drivers/staging/rtl8187se/ieee80211/ieee80211_rx.c
View File

@ -1159,9 +1159,7 @@ inline int ieee80211_network_init(
//by amy 080312
network->HighestOperaRate = 0;
//by amy 080312
#ifdef THOMAS_TURBO
network->Turbo_Enable = 0;
#endif
network->CountryIeLen = 0;
memset(network->CountryIeBuf, 0, MAX_IE_LEN);
@ -1338,7 +1336,6 @@ inline int ieee80211_network_init(
network->wpa_ie_len);
}
#ifdef THOMAS_TURBO
if (info_element->len == 7 &&
info_element->data[0] == 0x00 &&
info_element->data[1] == 0xe0 &&
@ -1347,7 +1344,6 @@ inline int ieee80211_network_init(
info_element->data[4] == 0x02) {
network->Turbo_Enable = 1;
}
#endif
if (1 == stats->nic_type) {//nic 87
break;
}
@ -1541,9 +1537,7 @@ inline void update_network(struct ieee80211_network *dst,
dst->QoS_Enable = 1;//for Rtl8187 simulation
#endif
dst->SignalStrength = src->SignalStrength;
#ifdef THOMAS_TURBO
dst->Turbo_Enable = src->Turbo_Enable;
#endif
dst->CountryIeLen = src->CountryIeLen;
memcpy(dst->CountryIeBuf, src->CountryIeBuf, src->CountryIeLen);
}

15
drivers/staging/rtl8187se/ieee80211/ieee80211_softmac.c
View File

@ -127,7 +127,6 @@ void ieee80211_WMM_Info(struct ieee80211_device *ieee, u8 **tag_p) {
*tag_p = tag;
}
#ifdef THOMAS_TURBO
void ieee80211_TURBO_Info(struct ieee80211_device *ieee, u8 **tag_p) {
u8 *tag = *tag_p;
@ -144,7 +143,6 @@ void ieee80211_TURBO_Info(struct ieee80211_device *ieee, u8 **tag_p) {
*tag_p = tag;
printk(KERN_ALERT "This is enable turbo mode IE process\n");
}
#endif
void enqueue_mgmt(struct ieee80211_device *ieee, struct sk_buff *skb)
{
@ -1108,9 +1106,7 @@ inline struct sk_buff *ieee80211_association_req(struct ieee80211_network *beaco
#endif
unsigned int rate_len = ieee80211_MFIE_rate_len(ieee);
unsigned int wmm_info_len = beacon->QoS_Enable?9:0;
#ifdef THOMAS_TURBO
unsigned int turbo_info_len = beacon->Turbo_Enable?9:0;
#endif
u8 encry_proto = ieee->wpax_type_notify & 0xff;
//u8 pairwise_type = (ieee->wpax_type_notify >> 8) & 0xff;
@ -1128,7 +1124,6 @@ inline struct sk_buff *ieee80211_association_req(struct ieee80211_network *beaco
wpa_len = 0;
}
}
#ifdef THOMAS_TURBO
len = sizeof(struct ieee80211_assoc_request_frame)+
+ beacon->ssid_len//essid tagged val
+ rate_len//rates tagged val
@ -1136,14 +1131,6 @@ inline struct sk_buff *ieee80211_association_req(struct ieee80211_network *beaco
+ rsn_len
+ wmm_info_len
+ turbo_info_len;
#else
len = sizeof(struct ieee80211_assoc_request_frame)+
+ beacon->ssid_len//essid tagged val
+ rate_len//rates tagged val
+ wpa_len
+ rsn_len
+ wmm_info_len;
#endif
skb = dev_alloc_skb(len);
@ -1389,12 +1376,10 @@ inline struct sk_buff *ieee80211_association_req(struct ieee80211_network *beaco
if(wmm_info_len) {
ieee80211_WMM_Info(ieee, &tag);
}
#ifdef THOMAS_TURBO
tag = skb_put(skb,turbo_info_len);
if(turbo_info_len) {
ieee80211_TURBO_Info(ieee, &tag);
}
#endif
return skb;
}

2
drivers/staging/rtl8187se/r8185b_init.c
View File

@ -2227,11 +2227,9 @@ ActUpdateChannelAccessSetting(
//lzm reserved 080826
#if 1
#ifdef THOMAS_TURBO
// For turbo mode setting. port from 87B by Isaiah 2008-08-01
if( ieee->current_network.Turbo_Enable == 1 )
AcParam.f.TXOPLimit = 0x01FF;
#endif
// For 87SE with Intel 4965 Ad-Hoc mode have poor throughput (19MB)
if (ieee->iw_mode == IW_MODE_ADHOC)
AcParam.f.TXOPLimit = 0x0020;