projects / cascardo / linux.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
rtlwifi: rtl8192ee: trx.c: Remove unused function
[cascardo/linux.git] / drivers / net / wireless / rtlwifi / rtl8192ee / trx.c
diff --git a/drivers/net/wireless/rtlwifi/rtl8192ee/trx.c b/drivers/net/wireless/rtlwifi/rtl8192ee/trx.c
index 2fcbef1..55d1da5 100644 (file)
--- a/drivers/net/wireless/rtlwifi/rtl8192ee/trx.c
+++ b/drivers/net/wireless/rtlwifi/rtl8192ee/trx.c
@@ -47,164 +47,6 @@ static u8 _rtl92ee_map_hwqueue_to_fwqueue(struct sk_buff *skb, u8 hw_queue)
        return skb->priority;
 }
 
-/* mac80211's rate_idx is like this:
- *
- * 2.4G band:rx_status->band == IEEE80211_BAND_2GHZ
- *
- * B/G rate:
- * (rx_status->flag & RX_FLAG_HT) = 0,
- * DESC92C_RATE1M-->DESC92C_RATE54M ==> idx is 0-->11,
- *
- * N rate:
- * (rx_status->flag & RX_FLAG_HT) = 1,
- * DESC92C_RATEMCS0-->DESC92C_RATEMCS15 ==> idx is 0-->15
- *
- * 5G band:rx_status->band == IEEE80211_BAND_5GHZ
- * A rate:
- * (rx_status->flag & RX_FLAG_HT) = 0,
- * DESC92C_RATE6M-->DESC92C_RATE54M ==> idx is 0-->7,
- *
- * N rate:
- * (rx_status->flag & RX_FLAG_HT) = 1,
- * DESC92C_RATEMCS0-->DESC92C_RATEMCS15 ==> idx is 0-->15
- */
-static int _rtl92ee_rate_mapping(struct ieee80211_hw *hw,
-                                bool isht, u8 desc_rate)
-{
-       int rate_idx;
-
-       if (!isht) {
-               if (IEEE80211_BAND_2GHZ == hw->conf.chandef.chan->band) {
-                       switch (desc_rate) {
-                       case DESC92C_RATE1M:
-                               rate_idx = 0;
-                               break;
-                       case DESC92C_RATE2M:
-                               rate_idx = 1;
-                               break;
-                       case DESC92C_RATE5_5M:
-                               rate_idx = 2;
-                               break;
-                       case DESC92C_RATE11M:
-                               rate_idx = 3;
-                               break;
-                       case DESC92C_RATE6M:
-                               rate_idx = 4;
-                               break;
-                       case DESC92C_RATE9M:
-                               rate_idx = 5;
-                               break;
-                       case DESC92C_RATE12M:
-                               rate_idx = 6;
-                               break;
-                       case DESC92C_RATE18M:
-                               rate_idx = 7;
-                               break;
-                       case DESC92C_RATE24M:
-                               rate_idx = 8;
-                               break;
-                       case DESC92C_RATE36M:
-                               rate_idx = 9;
-                               break;
-                       case DESC92C_RATE48M:
-                               rate_idx = 10;
-                               break;
-                       case DESC92C_RATE54M:
-                               rate_idx = 11;
-                               break;
-                       default:
-                               rate_idx = 0;
-                               break;
-                       }
-               } else {
-                       switch (desc_rate) {
-                       case DESC92C_RATE6M:
-                               rate_idx = 0;
-                               break;
-                       case DESC92C_RATE9M:
-                               rate_idx = 1;
-                               break;
-                       case DESC92C_RATE12M:
-                               rate_idx = 2;
-                               break;
-                       case DESC92C_RATE18M:
-                               rate_idx = 3;
-                               break;
-                       case DESC92C_RATE24M:
-                               rate_idx = 4;
-                               break;
-                       case DESC92C_RATE36M:
-                               rate_idx = 5;
-                               break;
-                       case DESC92C_RATE48M:
-                               rate_idx = 6;
-                               break;
-                       case DESC92C_RATE54M:
-                               rate_idx = 7;
-                               break;
-                       default:
-                               rate_idx = 0;
-                               break;
-                       }
-               }
-       } else {
-               switch (desc_rate) {
-               case DESC92C_RATEMCS0:
-                       rate_idx = 0;
-                       break;
-               case DESC92C_RATEMCS1:
-                       rate_idx = 1;
-                       break;
-               case DESC92C_RATEMCS2:
-                       rate_idx = 2;
-                       break;
-               case DESC92C_RATEMCS3:
-                       rate_idx = 3;
-                       break;
-               case DESC92C_RATEMCS4:
-                       rate_idx = 4;
-                       break;
-               case DESC92C_RATEMCS5:
-                       rate_idx = 5;
-                       break;
-               case DESC92C_RATEMCS6:
-                       rate_idx = 6;
-                       break;
-               case DESC92C_RATEMCS7:
-                       rate_idx = 7;
-                       break;
-               case DESC92C_RATEMCS8:
-                       rate_idx = 8;
-                       break;
-               case DESC92C_RATEMCS9:
-                       rate_idx = 9;
-                       break;
-               case DESC92C_RATEMCS10:
-                       rate_idx = 10;
-                       break;
-               case DESC92C_RATEMCS11:
-                       rate_idx = 11;
-                       break;
-               case DESC92C_RATEMCS12:
-                       rate_idx = 12;
-                       break;
-               case DESC92C_RATEMCS13:
-                       rate_idx = 13;
-                       break;
-               case DESC92C_RATEMCS14:
-                       rate_idx = 14;
-                       break;
-               case DESC92C_RATEMCS15:
-                       rate_idx = 15;
-                       break;
-               default:
-                       rate_idx = 0;
-                       break;
-               }
-       }
-       return rate_idx;
-}
-
 static void _rtl92ee_query_rxphystatus(struct ieee80211_hw *hw,
                                       struct rtl_stats *pstatus, u8 *pdesc,
                                       struct rx_fwinfo *p_drvinfo,
@@ -345,8 +187,8 @@ static void _rtl92ee_query_rxphystatus(struct ieee80211_hw *hw,
                pstatus->recvsignalpower = rx_pwr_all;
 
                /* (3)EVM of HT rate */
-               if (pstatus->rate >= DESC92C_RATEMCS8 &&
-                   pstatus->rate <= DESC92C_RATEMCS15)
+               if (pstatus->rate >= DESC_RATEMCS8 &&
+                   pstatus->rate <= DESC_RATEMCS15)
                        max_spatial_stream = 2;
                else
                        max_spatial_stream = 1;
@@ -576,9 +418,8 @@ bool rtl92ee_rx_query_desc(struct ieee80211_hw *hw,
         * are use (RX_FLAG_HT)
         * Notice: this is diff with windows define
         */
-       rx_status->rate_idx = _rtl92ee_rate_mapping(hw,
-                                                   status->is_ht,
-                                                   status->rate);
+       rx_status->rate_idx = rtlwifi_rate_mapping(hw, status->is_ht,
+                                                  false, status->rate);
 
        rx_status->mactime = status->timestamp_low;
        if (phystatus) {
@@ -710,27 +551,6 @@ static u16 get_desc_addr_fr_q_idx(u16 queue_index)
        return desc_address;
 }
 
-void rtl92ee_get_available_desc(struct ieee80211_hw *hw, u8 q_idx)
-{
-       struct rtl_pci *rtlpci = rtl_pcidev(rtl_pcipriv(hw));
-       struct rtl_priv *rtlpriv = rtl_priv(hw);
-       u16 point_diff = 0;
-       u16 current_tx_read_point = 0, current_tx_write_point = 0;
-       u32 tmp_4byte;
-
-       tmp_4byte = rtl_read_dword(rtlpriv,
-                                  get_desc_addr_fr_q_idx(q_idx));
-       current_tx_read_point = (u16)((tmp_4byte >> 16) & 0x0fff);
-       current_tx_write_point = (u16)((tmp_4byte) & 0x0fff);
-
-       point_diff = ((current_tx_read_point > current_tx_write_point) ?
-                     (current_tx_read_point - current_tx_write_point) :
-                     (TX_DESC_NUM_92E - current_tx_write_point +
-                      current_tx_read_point));
-
-       rtlpci->tx_ring[q_idx].avl_desc = point_diff;
-}
-
 void rtl92ee_pre_fill_tx_bd_desc(struct ieee80211_hw *hw,
                                 u8 *tx_bd_desc, u8 *desc, u8 queue_index,
                                 struct sk_buff *skb, dma_addr_t addr)
@@ -901,13 +721,13 @@ void rtl92ee_tx_fill_desc(struct ieee80211_hw *hw,
                } else {
                        if (rtlpriv->ra.is_special_data) {
                                ptcb_desc->use_driver_rate = true;
-                               SET_TX_DESC_TX_RATE(pdesc, DESC92C_RATE11M);
+                               SET_TX_DESC_TX_RATE(pdesc, DESC_RATE11M);
                        } else {
                                ptcb_desc->use_driver_rate = false;
                        }
                }
 
-               if (ptcb_desc->hw_rate > DESC92C_RATEMCS0)
+               if (ptcb_desc->hw_rate > DESC_RATEMCS0)
                        short_gi = (ptcb_desc->use_shortgi) ? 1 : 0;
                else
                        short_gi = (ptcb_desc->use_shortpreamble) ? 1 : 0;
@@ -927,7 +747,7 @@ void rtl92ee_tx_fill_desc(struct ieee80211_hw *hw,
                SET_TX_DESC_RTS_RATE(pdesc, ptcb_desc->rts_rate);
                SET_TX_DESC_RTS_SC(pdesc, ptcb_desc->rts_sc);
                SET_TX_DESC_RTS_SHORT(pdesc,
-                               ((ptcb_desc->rts_rate <= DESC92C_RATE54M) ?
+                               ((ptcb_desc->rts_rate <= DESC_RATE54M) ?
                                 (ptcb_desc->rts_use_shortpreamble ? 1 : 0) :
                                 (ptcb_desc->rts_use_shortgi ? 1 : 0)));
 
@@ -1038,7 +858,7 @@ void rtl92ee_tx_fill_cmddesc(struct ieee80211_hw *hw,
        if (firstseg)
                SET_TX_DESC_OFFSET(pdesc, txdesc_len);
 
-       SET_TX_DESC_TX_RATE(pdesc, DESC92C_RATE1M);
+       SET_TX_DESC_TX_RATE(pdesc, DESC_RATE1M);
 
        SET_TX_DESC_SEQ(pdesc, 0);
 
Unnamed repository; edit this file 'description' to name the repository.