summaryrefslogtreecommitdiffstats
path: root/drivers/staging/rtl8192e/rtllib_tx.c
diff options
context:
space:
mode:
authorLarry Finger <Larry.Finger@lwfinger.net>2011-07-11 22:25:07 -0500
committerLarry Finger <Larry.Finger@lwfinger.net>2011-08-23 20:11:59 -0500
commit1e71e6d0cf764841cdf60dec4a40849ff41be75c (patch)
tree57edd2c80373b38d4c46248190cec2eb2eb1eacd /drivers/staging/rtl8192e/rtllib_tx.c
parent175159c537312f95150508655256645c8daa86a0 (diff)
downloadop-kernel-dev-1e71e6d0cf764841cdf60dec4a40849ff41be75c.zip
op-kernel-dev-1e71e6d0cf764841cdf60dec4a40849ff41be75c.tar.gz
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 <Larry.Finger@lwfinger.net>
Diffstat (limited to 'drivers/staging/rtl8192e/rtllib_tx.c')
-rw-r--r--drivers/staging/rtl8192e/rtllib_tx.c107
1 files changed, 0 insertions, 107 deletions
diff --git a/drivers/staging/rtl8192e/rtllib_tx.c b/drivers/staging/rtl8192e/rtllib_tx.c
index 78b1707..7662bf5 100644
--- a/drivers/staging/rtl8192e/rtllib_tx.c
+++ b/drivers/staging/rtl8192e/rtllib_tx.c
@@ -449,53 +449,7 @@ void rtllib_query_BandwidthMode(struct rtllib_device* ieee, cb_desc *tcb_desc)
tcb_desc->bPacketBW = true;
return;
}
-#if defined(RTL8192U) || defined(RTL8192SU) || defined(RTL8192SE)
-extern void rtllib_ibss_query_HTCapShortGI(struct rtllib_device *ieee, cb_desc *tcb_desc,u8 is_peer_shortGI_40M,u8 is_peer_shortGI_20M)
-{
- PRT_HIGH_THROUGHPUT pHTInfo = ieee->pHTInfo;
-
- tcb_desc->bUseShortGI = false;
-
- if (!pHTInfo->bCurrentHTSupport||!pHTInfo->bEnableHT || (ieee->iw_mode != IW_MODE_ADHOC))
- {
- return;
- }
- if (pHTInfo->bForcedShortGI)
- {
- tcb_desc->bUseShortGI = true;
- return;
- }
- if ((pHTInfo->bCurBW40MHz==true) && is_peer_shortGI_40M)
- tcb_desc->bUseShortGI = true;
- else if ((pHTInfo->bCurBW40MHz==false) && is_peer_shortGI_20M)
- tcb_desc->bUseShortGI = true;
-}
-void rtllib_ibss_query_BandwidthMode(struct rtllib_device* ieee, cb_desc *tcb_desc, u8 is_peer_40M)
-{
- PRT_HIGH_THROUGHPUT pHTInfo = ieee->pHTInfo;
-
- tcb_desc->bPacketBW = false;
-
- if (!pHTInfo->bCurrentHTSupport||!pHTInfo->bEnableHT || (ieee->iw_mode != IW_MODE_ADHOC))
- {
- return;
- }
-
- if (tcb_desc->bMulticast || tcb_desc->bBroadcast)
- {
- return;
- }
-
- if ((tcb_desc->data_rate & 0x80)==0)
- {
- return;
- }
- if (pHTInfo->bCurBW40MHz && is_peer_40M && !ieee->bandwidth_auto_switch.bforced_tx20Mhz)
- tcb_desc->bPacketBW = true;
- return;
-}
-#endif
void rtllib_query_protectionmode(struct rtllib_device* ieee, cb_desc* tcb_desc, struct sk_buff* skb)
{
tcb_desc->bRTSSTBC = false;
@@ -596,11 +550,7 @@ NO_PROTECTION:
}
-#if defined(RTL8192U) || defined(RTL8192SU) || defined(RTL8192SE)
-void rtllib_txrate_selectmode(struct rtllib_device* ieee, cb_desc* tcb_desc,struct sta_info *psta)
-#else
void rtllib_txrate_selectmode(struct rtllib_device* ieee, cb_desc* tcb_desc)
-#endif
{
#ifdef TO_DO_LIST
if (!IsDataFrame(pFrame))
@@ -1000,62 +950,6 @@ int rtllib_xmit_inter(struct sk_buff *skb, struct net_device *dev)
tcb_desc->bMulticast = 1;
if (is_broadcast_ether_addr(header.addr1))
tcb_desc->bBroadcast = 1;
-#if defined(RTL8192U) || defined(RTL8192SU) || defined(RTL8192SE)
- if ( tcb_desc->bMulticast || tcb_desc->bBroadcast){
- rtllib_txrate_selectmode(ieee, tcb_desc, p_sta);
- tcb_desc->data_rate = ieee->basic_rate;
- }
- else
- {
- if (ieee->iw_mode == IW_MODE_ADHOC)
- {
- u8 is_peer_shortGI_40M = 0;
- u8 is_peer_shortGI_20M = 0;
- u8 is_peer_BW_40M = 0;
- p_sta = GetStaInfo(ieee, header.addr1);
- if (NULL == p_sta)
- {
- rtllib_txrate_selectmode(ieee, tcb_desc, p_sta);
- tcb_desc->data_rate = ieee->rate;
- }
- else
- {
- rtllib_txrate_selectmode(ieee, tcb_desc, p_sta);
- tcb_desc->data_rate = CURRENT_RATE(p_sta->wireless_mode, p_sta->CurDataRate, p_sta->htinfo.HTHighestOperaRate);
- is_peer_shortGI_40M = p_sta->htinfo.bCurShortGI40MHz;
- is_peer_shortGI_20M = p_sta->htinfo.bCurShortGI20MHz;
- is_peer_BW_40M = p_sta->htinfo.bCurTxBW40MHz;
- }
- rtllib_qurey_ShortPreambleMode(ieee, tcb_desc);
- rtllib_tx_query_agg_cap(ieee, txb->fragments[0], tcb_desc);
- rtllib_ibss_query_HTCapShortGI(ieee, tcb_desc,is_peer_shortGI_40M,is_peer_shortGI_20M);
- rtllib_ibss_query_BandwidthMode(ieee, tcb_desc,is_peer_BW_40M);
- rtllib_query_protectionmode(ieee, tcb_desc, txb->fragments[0]);
- }
- else {
- rtllib_txrate_selectmode(ieee, tcb_desc, p_sta);
- tcb_desc->data_rate = CURRENT_RATE(ieee->mode, ieee->rate, ieee->HTCurrentOperaRate);
- if (bdhcp == true){
- if (ieee->pHTInfo->IOTAction & HT_IOT_ACT_WA_IOT_Broadcom) {
- tcb_desc->data_rate = MGN_1M;
- tcb_desc->bTxDisableRateFallBack = false;
- }else{
- tcb_desc->data_rate = MGN_1M;
- tcb_desc->bTxDisableRateFallBack = 1;
- }
-
- tcb_desc->RATRIndex = 7;
- tcb_desc->bTxUseDriverAssingedRate = 1;
- tcb_desc->bdhcp = 1;
- }
- rtllib_qurey_ShortPreambleMode(ieee, tcb_desc);
- rtllib_tx_query_agg_cap(ieee, txb->fragments[0], tcb_desc);
- rtllib_query_HTCapShortGI(ieee, tcb_desc);
- rtllib_query_BandwidthMode(ieee, tcb_desc);
- rtllib_query_protectionmode(ieee, tcb_desc, txb->fragments[0]);
- }
- }
-#else
rtllib_txrate_selectmode(ieee, tcb_desc);
if ( tcb_desc->bMulticast || tcb_desc->bBroadcast)
tcb_desc->data_rate = ieee->basic_rate;
@@ -1083,7 +977,6 @@ int rtllib_xmit_inter(struct sk_buff *skb, struct net_device *dev)
rtllib_query_HTCapShortGI(ieee, tcb_desc);
rtllib_query_BandwidthMode(ieee, tcb_desc);
rtllib_query_protectionmode(ieee, tcb_desc, txb->fragments[0]);
-#endif
}
}
spin_unlock_irqrestore(&ieee->lock, flags);
OpenPOWER on IntegriCloud