1 files changed, 3 insertions, 27 deletions

diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8723be/trx.c b/drivers/net/wireless/realtek/rtlwifi/rtl8723be/trx.c
index fd9b38aa08a1..9f8dfb5af774 100644
--- a/drivers/net/wireless/realtek/rtlwifi/rtl8723be/trx.c
+++ b/drivers/net/wireless/realtek/rtlwifi/rtl8723be/trx.c
@@ -431,6 +431,7 @@ void rtl8723be_tx_fill_desc(struct ieee80211_hw *hw,
         struct rtl_mac *mac = rtl_mac(rtl_priv(hw));
         struct rtl_pci *rtlpci = rtl_pcidev(rtl_pcipriv(hw));
         struct rtl_hal *rtlhal = rtl_hal(rtlpriv);
+        struct rtlwifi_tx_info *tx_info = rtl_tx_skb_cb_info(skb);
         u8 *pdesc = (u8 *)pdesc_tx;
         u16 seq_number;
         __le16 fc = hdr->frame_control;
@@ -488,8 +489,6 @@ void rtl8723be_tx_fill_desc(struct ieee80211_hw *hw,
                         SET_TX_DESC_OFFSET(pdesc, USB_HWDESC_HEADER_LEN);
                 }
 
-                /* tx report */
-                rtl_get_tx_report(ptcb_desc, pdesc, hw);
 
                 /* ptcb_desc->use_driver_rate = true; */
                 SET_TX_DESC_TX_RATE(pdesc, ptcb_desc->hw_rate);
@@ -578,6 +577,8 @@ void rtl8723be_tx_fill_desc(struct ieee80211_hw *hw,
                                 SET_TX_DESC_HTC(pdesc, 1);
                         }
                 }
+                /* tx report */
+                rtl_set_tx_report(ptcb_desc, pdesc, hw, tx_info);
         }
 
         SET_TX_DESC_FIRST_SEG(pdesc, (firstseg ? 1 : 0));
@@ -760,28 +761,3 @@ void rtl8723be_tx_polling(struct ieee80211_hw *hw, u8 hw_queue)
                                BIT(0) << (hw_queue));
         }
 }
-
-u32 rtl8723be_rx_command_packet(struct ieee80211_hw *hw,
-                                const struct rtl_stats *status,
-                                struct sk_buff *skb)
-{
-        u32 result = 0;
-        struct rtl_priv *rtlpriv = rtl_priv(hw);
-
-        switch (status->packet_report_type) {
-        case NORMAL_RX:
-                        result = 0;
-                        break;
-        case C2H_PACKET:
-                        rtl8723be_c2h_packet_handler(hw, skb->data,
-                                                     (u8)skb->len);
-                        result = 1;
-                        break;
-        default:
-                        RT_TRACE(rtlpriv, COMP_RECV, DBG_TRACE,
-                                 "No this packet type!!\n");
-                        break;
-        }
-
-        return result;
-}