diff options
author | Mike McCormack <mikem@ring3k.org> | 2010-12-27 07:53:24 -0500 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2011-01-20 19:14:11 -0500 |
commit | a57d188daa8cd2867e6d8eca8d7cc7a8f5dcf628 (patch) | |
tree | 209e7e718df7b33703897fd51aff347c540f71bf /drivers/staging/rtl8192e/ieee80211 | |
parent | 951fc8ed5cf346efb1fe18dabb739bcb9d3403c6 (diff) |
Staging: rtl8192e: Remove pointless returns
Signed-off-by: Mike McCormack <mikem@ring3k.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/rtl8192e/ieee80211')
-rw-r--r-- | drivers/staging/rtl8192e/ieee80211/rtl819x_BAProc.c | 5 | ||||
-rw-r--r-- | drivers/staging/rtl8192e/ieee80211/rtl819x_HTProc.c | 16 |
2 files changed, 0 insertions, 21 deletions
diff --git a/drivers/staging/rtl8192e/ieee80211/rtl819x_BAProc.c b/drivers/staging/rtl8192e/ieee80211/rtl819x_BAProc.c index ae0e5b9e218..389b9353690 100644 --- a/drivers/staging/rtl8192e/ieee80211/rtl819x_BAProc.c +++ b/drivers/staging/rtl8192e/ieee80211/rtl819x_BAProc.c | |||
@@ -309,7 +309,6 @@ void ieee80211_send_ADDBAReq(struct ieee80211_device* ieee, u8* dst, PBA_RECORD | |||
309 | { | 309 | { |
310 | IEEE80211_DEBUG(IEEE80211_DL_ERR, "alloc skb error in function %s()\n", __FUNCTION__); | 310 | IEEE80211_DEBUG(IEEE80211_DL_ERR, "alloc skb error in function %s()\n", __FUNCTION__); |
311 | } | 311 | } |
312 | return; | ||
313 | } | 312 | } |
314 | 313 | ||
315 | /******************************************************************************************************************** | 314 | /******************************************************************************************************************** |
@@ -333,9 +332,6 @@ void ieee80211_send_ADDBARsp(struct ieee80211_device* ieee, u8* dst, PBA_RECORD | |||
333 | { | 332 | { |
334 | IEEE80211_DEBUG(IEEE80211_DL_ERR, "alloc skb error in function %s()\n", __FUNCTION__); | 333 | IEEE80211_DEBUG(IEEE80211_DL_ERR, "alloc skb error in function %s()\n", __FUNCTION__); |
335 | } | 334 | } |
336 | |||
337 | return; | ||
338 | |||
339 | } | 335 | } |
340 | /******************************************************************************************************************** | 336 | /******************************************************************************************************************** |
341 | *function: send ADDBARSP frame out | 337 | *function: send ADDBARSP frame out |
@@ -774,6 +770,5 @@ void RxBaInactTimeout(unsigned long data) | |||
774 | &pRxTs->RxAdmittedBARecord, | 770 | &pRxTs->RxAdmittedBARecord, |
775 | RX_DIR, | 771 | RX_DIR, |
776 | DELBA_REASON_TIMEOUT); | 772 | DELBA_REASON_TIMEOUT); |
777 | return ; | ||
778 | } | 773 | } |
779 | 774 | ||
diff --git a/drivers/staging/rtl8192e/ieee80211/rtl819x_HTProc.c b/drivers/staging/rtl8192e/ieee80211/rtl819x_HTProc.c index e031f42aea5..a4415972a60 100644 --- a/drivers/staging/rtl8192e/ieee80211/rtl819x_HTProc.c +++ b/drivers/staging/rtl8192e/ieee80211/rtl819x_HTProc.c | |||
@@ -145,8 +145,6 @@ void HTDebugHTCapability(u8* CapIE, u8* TitleString ) | |||
145 | IEEE80211_DEBUG(IEEE80211_DL_HT, "\tMPDU Density = %d\n", pCapELE->MPDUDensity); | 145 | IEEE80211_DEBUG(IEEE80211_DL_HT, "\tMPDU Density = %d\n", pCapELE->MPDUDensity); |
146 | IEEE80211_DEBUG(IEEE80211_DL_HT, "\tMCS Rate Set = [%x][%x][%x][%x][%x]\n", pCapELE->MCS[0],\ | 146 | IEEE80211_DEBUG(IEEE80211_DL_HT, "\tMCS Rate Set = [%x][%x][%x][%x][%x]\n", pCapELE->MCS[0],\ |
147 | pCapELE->MCS[1], pCapELE->MCS[2], pCapELE->MCS[3], pCapELE->MCS[4]); | 147 | pCapELE->MCS[1], pCapELE->MCS[2], pCapELE->MCS[3], pCapELE->MCS[4]); |
148 | return; | ||
149 | |||
150 | } | 148 | } |
151 | /******************************************************************************************************************** | 149 | /******************************************************************************************************************** |
152 | *function: This function print out each field on HT Information IE mainly from (Beacon/ProbeRsp) | 150 | *function: This function print out each field on HT Information IE mainly from (Beacon/ProbeRsp) |
@@ -211,7 +209,6 @@ void HTDebugHTInfo(u8* InfoIE, u8* TitleString) | |||
211 | 209 | ||
212 | IEEE80211_DEBUG(IEEE80211_DL_HT, "\tBasic MCS Rate Set = [%x][%x][%x][%x][%x]\n", pHTInfoEle->BasicMSC[0],\ | 210 | IEEE80211_DEBUG(IEEE80211_DL_HT, "\tBasic MCS Rate Set = [%x][%x][%x][%x][%x]\n", pHTInfoEle->BasicMSC[0],\ |
213 | pHTInfoEle->BasicMSC[1], pHTInfoEle->BasicMSC[2], pHTInfoEle->BasicMSC[3], pHTInfoEle->BasicMSC[4]); | 211 | pHTInfoEle->BasicMSC[1], pHTInfoEle->BasicMSC[2], pHTInfoEle->BasicMSC[3], pHTInfoEle->BasicMSC[4]); |
214 | return; | ||
215 | } | 212 | } |
216 | 213 | ||
217 | /* | 214 | /* |
@@ -729,15 +726,6 @@ void HTConstructCapabilityElement(struct ieee80211_device* ieee, u8* posHTCap, u | |||
729 | *len = 30 + 2; | 726 | *len = 30 + 2; |
730 | else | 727 | else |
731 | *len = 26 + 2; | 728 | *len = 26 + 2; |
732 | |||
733 | |||
734 | |||
735 | // IEEE80211_DEBUG_DATA(IEEE80211_DL_DATA | IEEE80211_DL_HT, posHTCap, *len -2); | ||
736 | |||
737 | //Print each field in detail. Driver should not print out this message by default | ||
738 | // HTDebugHTCapability(posHTCap, (u8*)"HTConstructCapability()"); | ||
739 | return; | ||
740 | |||
741 | } | 729 | } |
742 | /******************************************************************************************************************** | 730 | /******************************************************************************************************************** |
743 | *function: Construct Information Element in Beacon... if HTEnable is turned on | 731 | *function: Construct Information Element in Beacon... if HTEnable is turned on |
@@ -789,9 +777,6 @@ void HTConstructInfoElement(struct ieee80211_device* ieee, u8* posHTInfo, u8* le | |||
789 | //STA should not generate High Throughput Information Element | 777 | //STA should not generate High Throughput Information Element |
790 | *len = 0; | 778 | *len = 0; |
791 | } | 779 | } |
792 | //IEEE80211_DEBUG_DATA(IEEE80211_DL_DATA | IEEE80211_DL_HT, posHTInfo, *len - 2); | ||
793 | //HTDebugHTInfo(posHTInfo, "HTConstructInforElement"); | ||
794 | return; | ||
795 | } | 780 | } |
796 | 781 | ||
797 | /* | 782 | /* |
@@ -1648,7 +1633,6 @@ void HTUseDefaultSetting(struct ieee80211_device* ieee) | |||
1648 | { | 1633 | { |
1649 | pHTInfo->bCurrentHTSupport = false; | 1634 | pHTInfo->bCurrentHTSupport = false; |
1650 | } | 1635 | } |
1651 | return; | ||
1652 | } | 1636 | } |
1653 | /******************************************************************************************************************** | 1637 | /******************************************************************************************************************** |
1654 | *function: check whether HT control field exists | 1638 | *function: check whether HT control field exists |