From 1e71e6d0cf764841cdf60dec4a40849ff41be75c Mon Sep 17 00:00:00 2001 From: Larry Finger Date: Mon, 11 Jul 2011 22:25:07 -0500 Subject: staging: rtl8192e: Remove dead code associated with RTL8192SE The vendor code will generate several different drivers. As the RTL8192SE is covered by a mac80211 driver in mainline, eliminate that code heere. Signed-off-by: Larry Finger --- drivers/staging/rtl8192e/rtllib_softmac.c | 53 ------------------------------- 1 file changed, 53 deletions(-) (limited to 'drivers/staging/rtl8192e/rtllib_softmac.c') diff --git a/drivers/staging/rtl8192e/rtllib_softmac.c b/drivers/staging/rtl8192e/rtllib_softmac.c index dadb5430bfa..c9c5df4c994 100644 --- a/drivers/staging/rtl8192e/rtllib_softmac.c +++ b/drivers/staging/rtl8192e/rtllib_softmac.c @@ -1066,14 +1066,6 @@ static struct sk_buff* rtllib_probe_resp(struct rtllib_device *ieee, u8 *dest) *(tag++) = 1; *(tag++) = erpinfo_content; } -#if defined(RTL8192U) || defined(RTL8192SU) || defined(RTL8192SE) - if (tmp_ht_cap_len){ - *(tag++) = MFIE_TYPE_HT_CAP; - *(tag++) = tmp_ht_cap_len - 2; - memcpy(tag, tmp_ht_cap_buf, tmp_ht_cap_len - 2); - tag += tmp_ht_cap_len - 2; - } -#endif if (rate_ex_len){ *(tag++) = MFIE_TYPE_RATES_EX; *(tag++) = rate_ex_len-2; @@ -1081,15 +1073,6 @@ static struct sk_buff* rtllib_probe_resp(struct rtllib_device *ieee, u8 *dest) tag+=rate_ex_len-2; } -#if defined(RTL8192U) || defined(RTL8192SU) || defined(RTL8192SE) - if (tmp_ht_info_len){ - *(tag++) = MFIE_TYPE_HT_INFO; - *(tag++) = tmp_ht_info_len - 2; - memcpy(tag, tmp_ht_info_buf, tmp_ht_info_len -2); - tag += tmp_ht_info_len - 2; - } -#endif - if (wpa_ie_len) { if (ieee->iw_mode == IW_MODE_ADHOC) @@ -1100,23 +1083,6 @@ static struct sk_buff* rtllib_probe_resp(struct rtllib_device *ieee, u8 *dest) tag += ieee->wpa_ie_len; } -#if defined(RTL8192U) || defined(RTL8192SU) || defined(RTL8192SE) - if (tmp_generic_ie_len) - { - (*tag++) = 0xdd; - (*tag++) = tmp_generic_ie_len - 2; - memcpy(tag,tmp_generic_ie_buf,tmp_generic_ie_len -2); - tag += tmp_generic_ie_len -2; - - } -#endif - -#if defined(RTL8192U) || defined(RTL8192SU) || defined(RTL8192SE) - if (wmm_len) { - memcpy(tag,wmmie,wmm_len); - tag += wmm_len; - } -#endif return skb; } @@ -2154,20 +2120,10 @@ static inline u16 assoc_parse(struct rtllib_device *ieee, struct sk_buff *skb, i void rtllib_rx_probe_rq(struct rtllib_device *ieee, struct sk_buff *skb) { u8 dest[ETH_ALEN]; -#if defined(RTL8192U) || defined(RTL8192SU) || defined(RTL8192SE) - struct sta_info *psta = NULL; -#endif ieee->softmac_stats.rx_probe_rq++; if (probe_rq_parse(ieee, skb, dest) > 0){ ieee->softmac_stats.tx_probe_rs++; rtllib_resp_to_probe(ieee, dest); -#if defined(RTL8192U) || defined(RTL8192SU) || defined(RTL8192SE) - if (ieee->iw_mode == IW_MODE_ADHOC){ - psta = GetStaInfo(ieee, dest); - if (NULL != psta) - psta->LastActiveTime = jiffies; - } -#endif } } @@ -3040,17 +2996,8 @@ void rtllib_start_ibss_wq(void *data) ieee->rate = 22; } -#if defined(RTL8192U) || defined(RTL8192SU) || defined(RTL8192SE) -#ifdef ADHOC_11N - ieee->current_network.qos_data.supported = 1; -#else - ieee->current_network.qos_data.supported = 0; -#endif - ieee->SetWirelessMode(ieee->dev, ieee->mode); -#else ieee->current_network.qos_data.supported = 0; ieee->SetWirelessMode(ieee->dev, IEEE_G); -#endif ieee->current_network.mode = ieee->mode; ieee->current_network.atim_window = 0; ieee->current_network.capability = WLAN_CAPABILITY_IBSS; -- cgit v1.2.3-70-g09d2