Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b8545591 authored by Bartlomiej Zolnierkiewicz's avatar Bartlomiej Zolnierkiewicz Committed by Greg Kroah-Hartman
Browse files

Staging: rtl8192su: remove THOMAS_TURBO ifdefs 



Signed-off-by: default avatarBartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent b81ad777

drivers/staging/rtl8192su/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -5,7 +5,7 @@ EXTRA_CFLAGS += -O2 
EXTRA_CFLAGS += -mhard-float -DCONFIG_FORCE_HARD_FLOAT=y



EXTRA_CFLAGS += -DJACKSON_NEW_RX

EXTRA_CFLAGS += -DTHOMAS_BEACON -DTHOMAS_TURBO

EXTRA_CFLAGS += -DTHOMAS_BEACON

#EXTRA_CFLAGS += -DUSE_ONE_PIPE



EXTRA_CFLAGS += -DRTL8192SU

drivers/staging/rtl8192su/ieee80211/ieee80211.h

+0 −2
Original line number Diff line number Diff line
@@ -1443,9 +1443,7 @@ struct ieee80211_network { 
        u8 wmm_info;

        struct ieee80211_wmm_ac_param wmm_param[4];

        u8 QoS_Enable;

#ifdef THOMAS_TURBO

	u8 Turbo_Enable;//enable turbo mode, added by thomas

#endif

	u16 CountryIeLen;

	u8 CountryIeBuf[MAX_IE_LEN];

        // HT Related, by amy, 2008.04.29

drivers/staging/rtl8192su/ieee80211/ieee80211_rx.c

+0 −6
Original line number Diff line number Diff line
@@ -1880,7 +1880,6 @@ int ieee80211_parse_info_param(struct ieee80211_device *ieee, 
				break;

			}



#ifdef THOMAS_TURBO

                        if (info_element->len == 7 &&

                            info_element->data[0] == 0x00 &&

                            info_element->data[1] == 0xe0 &&
@@ -1889,7 +1888,6 @@ int ieee80211_parse_info_param(struct ieee80211_device *ieee, 
                            info_element->data[4] == 0x02) {

                                network->Turbo_Enable = 1;

                        }

#endif



                        //for HTcap and HTinfo parameters

			if(tmp_htcap_len == 0){
@@ -2350,9 +2348,7 @@ static inline int ieee80211_network_init( 
	network->unknown_cap_exist = false;

	network->realtek_cap_exit = false;

	network->marvell_cap_exist = false;

#ifdef THOMAS_TURBO

	network->Turbo_Enable = 0;

#endif

	network->CountryIeLen = 0;

	memset(network->CountryIeBuf, 0, MAX_IE_LEN);

//Initialize HT parameters
@@ -2528,9 +2524,7 @@ static inline void update_network(struct ieee80211_network *dst, 
#else

	dst->QoS_Enable = 1;//for Rtl8187 simulation

#endif

#ifdef THOMAS_TURBO

	dst->Turbo_Enable = src->Turbo_Enable;

#endif



	dst->CountryIeLen = src->CountryIeLen;

	memcpy(dst->CountryIeBuf, src->CountryIeBuf, src->CountryIeLen);

drivers/staging/rtl8192su/ieee80211/ieee80211_softmac.c

+0 −20
Original line number Diff line number Diff line
@@ -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)

{
@@ -1063,9 +1061,7 @@ inline struct sk_buff *ieee80211_association_req(struct ieee80211_network *beaco 


	unsigned int rate_len = ieee80211_MFIE_rate_len(ieee);

	unsigned int wmm_info_len = beacon->qos_data.supported?9:0;

#ifdef THOMAS_TURBO

	unsigned int turbo_info_len = beacon->Turbo_Enable?9:0;

#endif



	int len = 0;
@@ -1103,7 +1099,6 @@ inline struct sk_buff *ieee80211_association_req(struct ieee80211_network *beaco 
	{

		cxvernum_ie_len = 5+2;

	}

#ifdef THOMAS_TURBO

	len = sizeof(struct ieee80211_assoc_request_frame)+ 2

		+ beacon->ssid_len//essid tagged val

		+ rate_len//rates tagged val
@@ -1116,19 +1111,6 @@ inline struct sk_buff *ieee80211_association_req(struct ieee80211_network *beaco 
		+ ccxrm_ie_len

		+ cxvernum_ie_len

		+ ieee->tx_headroom;

#else

	len = sizeof(struct ieee80211_assoc_request_frame)+ 2

		+ beacon->ssid_len//essid tagged val

		+ rate_len//rates tagged val

		+ wpa_ie_len

		+ wmm_info_len

                + ht_cap_len

		+ realtek_ie_len

		+ ckip_ie_len

		+ ccxrm_ie_len

		+ cxvernum_ie_len

		+ ieee->tx_headroom;

#endif



	skb = dev_alloc_skb(len);
@@ -1250,12 +1232,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



	if(ieee->pHTInfo->bCurrentHTSupport&&ieee->pHTInfo->bEnableHT){

		if(ieee->pHTInfo->ePeerHTSpecVer == HT_SPEC_VER_EWC)