aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMike McCormack <mikem@ring3k.org>2011-03-10 08:32:26 -0500
committerGreg Kroah-Hartman <gregkh@suse.de>2011-03-14 15:24:43 -0400
commita78275349ceca6dea754ddaa0ef85ab636af57c1 (patch)
tree75f074102567b869cca802c499e51addce3a0d18
parent9a77bd58f6bfe05df7ec807c22be40fb2dc62e23 (diff)
staging: rtl8192e: Delete unused struct members
Signed-off-by: Mike McCormack <mikem@ring3k.org> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
-rw-r--r--drivers/staging/rtl8192e/ieee80211/ieee80211.h12
-rw-r--r--drivers/staging/rtl8192e/r8192E_core.c11
2 files changed, 1 insertions, 22 deletions
diff --git a/drivers/staging/rtl8192e/ieee80211/ieee80211.h b/drivers/staging/rtl8192e/ieee80211/ieee80211.h
index d8f9c898110e..f9678734ac25 100644
--- a/drivers/staging/rtl8192e/ieee80211/ieee80211.h
+++ b/drivers/staging/rtl8192e/ieee80211/ieee80211.h
@@ -880,7 +880,6 @@ struct ieee_ibss_seq {
880 * information for frames received. Not setting these will not cause 880 * information for frames received. Not setting these will not cause
881 * any adverse affects. */ 881 * any adverse affects. */
882struct ieee80211_rx_stats { 882struct ieee80211_rx_stats {
883#if 1
884 u32 mac_time[2]; 883 u32 mac_time[2];
885 s8 rssi; 884 s8 rssi;
886 u8 signal; 885 u8 signal;
@@ -895,7 +894,6 @@ struct ieee80211_rx_stats {
895 u32 beacon_time; 894 u32 beacon_time;
896 u8 nic_type; 895 u8 nic_type;
897 u16 Length; 896 u16 Length;
898 // u8 DataRate; // In 0.5 Mbps
899 u8 SignalQuality; // in 0-100 index. 897 u8 SignalQuality; // in 0-100 index.
900 s32 RecvSignalPower; // Real power in dBm for this packet, no beautification and aggregation. 898 s32 RecvSignalPower; // Real power in dBm for this packet, no beautification and aggregation.
901 s8 RxPower; // in dBm Translate from PWdB 899 s8 RxPower; // in dBm Translate from PWdB
@@ -924,26 +922,16 @@ struct ieee80211_rx_stats {
924 bool bIsAMPDU; 922 bool bIsAMPDU;
925 bool bFirstMPDU; 923 bool bFirstMPDU;
926 bool bContainHTC; 924 bool bContainHTC;
927 bool RxIs40MHzPacket;
928 u32 RxPWDBAll; 925 u32 RxPWDBAll;
929 u8 RxMIMOSignalStrength[4]; // in 0~100 index 926 u8 RxMIMOSignalStrength[4]; // in 0~100 index
930 s8 RxMIMOSignalQuality[2]; 927 s8 RxMIMOSignalQuality[2];
931 bool bPacketMatchBSSID; 928 bool bPacketMatchBSSID;
932 bool bIsCCK; 929 bool bIsCCK;
933 bool bPacketToSelf; 930 bool bPacketToSelf;
934 //added by amy
935 u8* virtual_address; 931 u8* virtual_address;
936 u16 packetlength; // Total packet length: Must equal to sum of all FragLength
937 u16 fraglength; // FragLength should equal to PacketLength in non-fragment case
938 u16 fragoffset; // Data offset for this fragment
939 u16 ntotalfrag;
940 bool bisrxaggrsubframe;
941 bool bPacketBeacon; //cosa add for rssi 932 bool bPacketBeacon; //cosa add for rssi
942 bool bToSelfBA; //cosa add for rssi 933 bool bToSelfBA; //cosa add for rssi
943 char cck_adc_pwdb[4]; //cosa add for rx path selection 934 char cck_adc_pwdb[4]; //cosa add for rx path selection
944 u16 Seq_Num;
945#endif
946
947}; 935};
948 936
949/* IEEE 802.11 requires that STA supports concurrent reception of at least 937/* IEEE 802.11 requires that STA supports concurrent reception of at least
diff --git a/drivers/staging/rtl8192e/r8192E_core.c b/drivers/staging/rtl8192e/r8192E_core.c
index 8715d2cee8f1..3877ce57d40a 100644
--- a/drivers/staging/rtl8192e/r8192E_core.c
+++ b/drivers/staging/rtl8192e/r8192E_core.c
@@ -3742,8 +3742,7 @@ static void rtl8192_process_phyinfo(struct r8192_priv * priv, u8* buffer,struct
3742 sc = le16_to_cpu(hdr->seq_ctl); 3742 sc = le16_to_cpu(hdr->seq_ctl);
3743 frag = WLAN_GET_SEQ_FRAG(sc); 3743 frag = WLAN_GET_SEQ_FRAG(sc);
3744 seq = WLAN_GET_SEQ_SEQ(sc); 3744 seq = WLAN_GET_SEQ_SEQ(sc);
3745 //cosa add 04292008 to record the sequence number 3745
3746 pcurrent_stats->Seq_Num = seq;
3747 // 3746 //
3748 // Check whether we should take the previous packet into accounting 3747 // Check whether we should take the previous packet into accounting
3749 // 3748 //
@@ -4248,7 +4247,6 @@ rtl8192_record_rxdesc_forlateruse(
4248{ 4247{
4249 ptarget_stats->bIsAMPDU = psrc_stats->bIsAMPDU; 4248 ptarget_stats->bIsAMPDU = psrc_stats->bIsAMPDU;
4250 ptarget_stats->bFirstMPDU = psrc_stats->bFirstMPDU; 4249 ptarget_stats->bFirstMPDU = psrc_stats->bFirstMPDU;
4251 //ptarget_stats->Seq_Num = psrc_stats->Seq_Num;
4252} 4250}
4253 4251
4254 4252
@@ -4486,8 +4484,6 @@ static void rtl8192_rx(struct r8192_priv *priv)
4486 if((stats.RxBufShift + stats.RxDrvInfoSize) > 0) 4484 if((stats.RxBufShift + stats.RxDrvInfoSize) > 0)
4487 stats.bShift = 1; 4485 stats.bShift = 1;
4488 4486
4489 stats.RxIs40MHzPacket = pDrvInfo->BW;
4490
4491 /* ???? */ 4487 /* ???? */
4492 TranslateRxSignalStuff819xpci(priv, skb, &stats, pdesc, pDrvInfo); 4488 TranslateRxSignalStuff819xpci(priv, skb, &stats, pdesc, pDrvInfo);
4493 4489
@@ -4509,11 +4505,6 @@ static void rtl8192_rx(struct r8192_priv *priv)
4509 unicast_packet = true; 4505 unicast_packet = true;
4510 } 4506 }
4511 4507
4512 stats.packetlength = stats.Length-4;
4513 stats.fraglength = stats.packetlength;
4514 stats.fragoffset = 0;
4515 stats.ntotalfrag = 1;
4516
4517 if(!ieee80211_rtl_rx(priv->ieee80211, skb, &stats)){ 4508 if(!ieee80211_rtl_rx(priv->ieee80211, skb, &stats)){
4518 dev_kfree_skb_any(skb); 4509 dev_kfree_skb_any(skb);
4519 } else { 4510 } else {