rtlwifi: remove duplicate C2H handler

Merge duplicate C2H handler and implement the handler in base.c.

Signed-off-by: Ping-Ke Shih <pkshih@realtek.com>
Signed-off-by: Kalle Valo <kvalo@codeaurora.org>

diff --git a/drivers/net/wireless/realtek/rtlwifi/base.c b/drivers/net/wireless/realtek/rtlwifi/base.c
index 759a802ccbee47fcf6eb64918790004f27ba9848..0d03e98f9cb4d3d6b10331b34373fde60f82932a 100644 (file)
--- a/drivers/net/wireless/realtek/rtlwifi/base.c
+++ b/drivers/net/wireless/realtek/rtlwifi/base.c
@@ -2306,6 +2306,78 @@ label_err:
 }
 EXPORT_SYMBOL(rtl_c2hcmd_enqueue);
 
+void rtl_c2h_content_parsing(struct ieee80211_hw *hw, u8 cmd_id,
+                            u8 cmd_len, u8 *cmd_buf)
+{
+       struct rtl_priv *rtlpriv = rtl_priv(hw);
+       struct rtl_hal_ops *hal_ops = rtlpriv->cfg->ops;
+       const struct rtl_btc_ops *btc_ops = rtlpriv->btcoexist.btc_ops;
+
+       switch (cmd_id) {
+       case C2H_DBG:
+               RT_TRACE(rtlpriv, COMP_FW, DBG_LOUD, "[C2H], C2H_DBG!!\n");
+               break;
+       case C2H_TXBF:
+               RT_TRACE(rtlpriv, COMP_FW, DBG_TRACE,
+                        "[C2H], C2H_TXBF!!\n");
+               break;
+       case C2H_TX_REPORT:
+               rtl_tx_report_handler(hw, cmd_buf, cmd_len);
+               break;
+       case C2H_RA_RPT:
+               if (hal_ops->c2h_ra_report_handler)
+                       hal_ops->c2h_ra_report_handler(hw, cmd_buf, cmd_len);
+               break;
+       case C2H_BT_INFO:
+               RT_TRACE(rtlpriv, COMP_FW, DBG_TRACE,
+                        "[C2H], C2H_BT_INFO!!\n");
+               if (rtlpriv->cfg->ops->get_btc_status())
+                       btc_ops->btc_btinfo_notify(rtlpriv, cmd_buf, cmd_len);
+               break;
+       case C2H_BT_MP:
+               RT_TRACE(rtlpriv, COMP_FW, DBG_TRACE,
+                        "[C2H], C2H_BT_MP!!\n");
+               if (rtlpriv->cfg->ops->get_btc_status())
+                       btc_ops->btc_btmpinfo_notify(rtlpriv, cmd_buf, cmd_len);
+               break;
+       default:
+               RT_TRACE(rtlpriv, COMP_FW, DBG_TRACE,
+                        "[C2H], Unknown packet!! cmd_id(%#X)!\n", cmd_id);
+               break;
+       }
+}
+EXPORT_SYMBOL_GPL(rtl_c2h_content_parsing);
+
+void rtl_c2h_packet_handler(struct ieee80211_hw *hw, u8 *buffer, u8 len)
+{
+       struct rtl_priv *rtlpriv = rtl_priv(hw);
+       u8 c2h_cmd_id = 0, c2h_cmd_seq = 0, c2h_cmd_len = 0;
+       u8 *tmp_buf = NULL;
+
+       c2h_cmd_id = buffer[0];
+       c2h_cmd_seq = buffer[1];
+       c2h_cmd_len = len - 2;
+       tmp_buf = buffer + 2;
+
+       RT_TRACE(rtlpriv, COMP_FW, DBG_TRACE,
+                "[C2H packet], c2hCmdId=0x%x, c2hCmdSeq=0x%x, c2hCmdLen=%d\n",
+                c2h_cmd_id, c2h_cmd_seq, c2h_cmd_len);
+
+       RT_PRINT_DATA(rtlpriv, COMP_FW, DBG_TRACE,
+                     "[C2H packet], Content Hex:\n", tmp_buf, c2h_cmd_len);
+
+       switch (c2h_cmd_id) {
+       case C2H_BT_INFO:
+       case C2H_BT_MP:
+               rtl_c2hcmd_enqueue(hw, c2h_cmd_id, c2h_cmd_len, tmp_buf);
+               break;
+       default:
+               rtl_c2h_content_parsing(hw, c2h_cmd_id, c2h_cmd_len, tmp_buf);
+               break;
+       }
+}
+EXPORT_SYMBOL_GPL(rtl_c2h_packet_handler);
+
 void rtl_c2hcmd_launcher(struct ieee80211_hw *hw, int exec)
 {
        struct rtl_priv *rtlpriv = rtl_priv(hw);

diff --git a/drivers/net/wireless/realtek/rtlwifi/base.h b/drivers/net/wireless/realtek/rtlwifi/base.h
index 19e7477839e48bda8ff9be24b065bfd8a910d31f..3bf174e5b07eee0235a222f478647182e8295012 100644 (file)
--- a/drivers/net/wireless/realtek/rtlwifi/base.h
+++ b/drivers/net/wireless/realtek/rtlwifi/base.h
@@ -162,6 +162,9 @@ void rtl_fwevt_wq_callback(void *data);
 void rtl_c2hcmd_wq_callback(void *data);
 void rtl_c2hcmd_launcher(struct ieee80211_hw *hw, int exec);
 void rtl_c2hcmd_enqueue(struct ieee80211_hw *hw, u8 tag, u8 len, u8 *val);
+void rtl_c2h_content_parsing(struct ieee80211_hw *hw, u8 c2h_cmd_id,
+                            u8 c2h_cmd_len, u8 *tmp_buf);
+void rtl_c2h_packet_handler(struct ieee80211_hw *hw, u8 *buffer, u8 len);
 
 u8 rtl_mrate_idx_to_arfr_id(struct ieee80211_hw *hw, u8 rate_index,
                            enum wireless_mode wirelessmode);

diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8192ee/fw.c b/drivers/net/wireless/realtek/rtlwifi/rtl8192ee/fw.c
index a2d9e217bc65578895f6bdf47ab499eabede0ccb..84a0d0eb72e1e404a746d0957ea36d4d289bd026 100644 (file)
--- a/drivers/net/wireless/realtek/rtlwifi/rtl8192ee/fw.c
+++ b/drivers/net/wireless/realtek/rtlwifi/rtl8192ee/fw.c
@@ -884,78 +884,3 @@ void rtl92ee_c2h_ra_report_handler(struct ieee80211_hw *hw,
 
        rtl92ee_dm_dynamic_arfb_select(hw, rate, collision_state);
 }
-
-void rtl92ee_c2h_content_parsing(struct ieee80211_hw *hw, u8 c2h_cmd_id,
-                                u8 c2h_cmd_len, u8 *tmp_buf)
-{
-       struct rtl_priv *rtlpriv = rtl_priv(hw);
-       struct rtl_hal_ops *hal_ops = rtlpriv->cfg->ops;
-       struct rtl_btc_ops *btc_ops = rtlpriv->btcoexist.btc_ops;
-
-       switch (c2h_cmd_id) {
-       case C2H_DBG:
-               RT_TRACE(rtlpriv, COMP_FW, DBG_TRACE,
-                        "[C2H], C2H_8723BE_DBG!!\n");
-               break;
-       case C2H_TXBF:
-               RT_TRACE(rtlpriv, COMP_FW, DBG_TRACE,
-                        "[C2H], C2H_8192E_TXBF!!\n");
-               break;
-       case C2H_TX_REPORT:
-               RT_TRACE(rtlpriv, COMP_FW, DBG_TRACE ,
-                        "[C2H], C2H_8723BE_TX_REPORT!\n");
-               rtl_tx_report_handler(hw, tmp_buf, c2h_cmd_len);
-               break;
-       case C2H_BT_INFO:
-               RT_TRACE(rtlpriv, COMP_FW, DBG_TRACE,
-                        "[C2H], C2H_8723BE_BT_INFO!!\n");
-               if (rtlpriv->cfg->ops->get_btc_status())
-                       btc_ops->btc_btinfo_notify(rtlpriv, tmp_buf,
-                                                  c2h_cmd_len);
-               break;
-       case C2H_BT_MP:
-               RT_TRACE(rtlpriv, COMP_FW, DBG_TRACE,
-                        "[C2H], C2H_8723BE_BT_MP!!\n");
-               if (rtlpriv->cfg->ops->get_btc_status())
-                       btc_ops->btc_btmpinfo_notify(rtlpriv, tmp_buf,
-                                                    c2h_cmd_len);
-               break;
-       case C2H_RA_RPT:
-               hal_ops->c2h_ra_report_handler(hw, tmp_buf, c2h_cmd_len);
-               break;
-       default:
-               RT_TRACE(rtlpriv, COMP_FW, DBG_TRACE,
-                        "[C2H], Unknown packet!! CmdId(%#X)!\n", c2h_cmd_id);
-               break;
-       }
-}
-
-void rtl92ee_c2h_packet_handler(struct ieee80211_hw *hw, u8 *buffer, u8 len)
-{
-       struct rtl_priv *rtlpriv = rtl_priv(hw);
-       u8 c2h_cmd_id = 0, c2h_cmd_seq = 0, c2h_cmd_len = 0;
-       u8 *tmp_buf = NULL;
-
-       c2h_cmd_id = buffer[0];
-       c2h_cmd_seq = buffer[1];
-       c2h_cmd_len = len - 2;
-       tmp_buf = buffer + 2;
-
-       RT_TRACE(rtlpriv, COMP_FW, DBG_TRACE,
-                "[C2H packet], c2hCmdId=0x%x, c2hCmdSeq=0x%x, c2hCmdLen=%d\n",
-                c2h_cmd_id, c2h_cmd_seq, c2h_cmd_len);
-
-       RT_PRINT_DATA(rtlpriv, COMP_FW, DBG_TRACE,
-                     "[C2H packet], Content Hex:\n", tmp_buf, c2h_cmd_len);
-
-       switch (c2h_cmd_id) {
-       case C2H_BT_INFO:
-       case C2H_BT_MP:
-               rtl_c2hcmd_enqueue(hw, c2h_cmd_id, c2h_cmd_len, tmp_buf);
-               break;
-       default:
-               rtl92ee_c2h_content_parsing(hw, c2h_cmd_id, c2h_cmd_len,
-                                           tmp_buf);
-               break;
-       }
-}

diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8192ee/fw.h b/drivers/net/wireless/realtek/rtlwifi/rtl8192ee/fw.h
index e5fae0a86a2756a5cbb00e51ece75693b9c47363..6a2fbf20d579e2b29d45879e81243f853026e34d 100644 (file)
--- a/drivers/net/wireless/realtek/rtlwifi/rtl8192ee/fw.h
+++ b/drivers/net/wireless/realtek/rtlwifi/rtl8192ee/fw.h
@@ -179,9 +179,6 @@ void rtl92ee_set_fw_pwrmode_cmd(struct ieee80211_hw *hw, u8 mode);
 void rtl92ee_set_fw_media_status_rpt_cmd(struct ieee80211_hw *hw, u8 mstatus);
 void rtl92ee_set_fw_rsvdpagepkt(struct ieee80211_hw *hw, bool b_dl_finished);
 void rtl92ee_set_p2p_ps_offload_cmd(struct ieee80211_hw *hw, u8 p2p_ps_state);
-void rtl92ee_c2h_packet_handler(struct ieee80211_hw *hw, u8 *buffer, u8 len);
-void rtl92ee_c2h_content_parsing(struct ieee80211_hw *hw, u8 c2h_cmd_id,
-                                u8 c2h_cmd_len, u8 *tmp_buf);
 void rtl92ee_c2h_ra_report_handler(struct ieee80211_hw *hw,
                                   u8 *cmd_buf, u8 cmd_len);
 #endif

diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8192ee/sw.c b/drivers/net/wireless/realtek/rtlwifi/rtl8192ee/sw.c
index c5c26b537cd2ca60d9b0c8e2d485869a1b485914..fd028274c59364a336f846a3402393980beac44b 100644 (file)
--- a/drivers/net/wireless/realtek/rtlwifi/rtl8192ee/sw.c
+++ b/drivers/net/wireless/realtek/rtlwifi/rtl8192ee/sw.c
@@ -251,7 +251,7 @@ static struct rtl_hal_ops rtl8192ee_hal_ops = {
        .fill_h2c_cmd = rtl92ee_fill_h2c_cmd,
        .get_btc_status = rtl92ee_get_btc_status,
        .rx_command_packet = rtl92ee_rx_command_packet,
-       .c2h_content_parsing = rtl92ee_c2h_content_parsing,
+       .c2h_content_parsing = rtl_c2h_content_parsing,
        .c2h_ra_report_handler = rtl92ee_c2h_ra_report_handler,
 };
 

diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8192ee/trx.c b/drivers/net/wireless/realtek/rtlwifi/rtl8192ee/trx.c
index 852a2701ef5575644a246315f97cb3ca2b10c62d..e525c2bb44572140d9493b7e61b18404215ec1fc 100644 (file)
--- a/drivers/net/wireless/realtek/rtlwifi/rtl8192ee/trx.c
+++ b/drivers/net/wireless/realtek/rtlwifi/rtl8192ee/trx.c
@@ -1085,7 +1085,7 @@ u32 rtl92ee_rx_command_packet(struct ieee80211_hw *hw,
                result = 0;
                break;
        case C2H_PACKET:
-               rtl92ee_c2h_packet_handler(hw, skb->data, (u8)skb->len);
+               rtl_c2h_packet_handler(hw, skb->data, (u8)skb->len);
                result = 1;
                break;
        default:

diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8723be/fw.c b/drivers/net/wireless/realtek/rtlwifi/rtl8723be/fw.c
index 34703b9cf5e845eb183b57a46e6786abe38402a6..f2441fbb92f1e7fc1283650024f4ae9aa56a1dba 100644 (file)
--- a/drivers/net/wireless/realtek/rtlwifi/rtl8723be/fw.c
+++ b/drivers/net/wireless/realtek/rtlwifi/rtl8723be/fw.c
@@ -703,72 +703,3 @@ void rtl8723be_set_p2p_ps_offload_cmd(struct ieee80211_hw *hw,
        rtl8723be_fill_h2c_cmd(hw, H2C_8723B_P2P_PS_OFFLOAD, 1,
                               (u8 *)p2p_ps_offload);
 }
-
-void rtl8723be_c2h_content_parsing(struct ieee80211_hw *hw,
-                                  u8 c2h_cmd_id,
-                                  u8 c2h_cmd_len, u8 *tmp_buf)
-{
-       struct rtl_priv *rtlpriv = rtl_priv(hw);
-       struct rtl_btc_ops *btc_ops = rtlpriv->btcoexist.btc_ops;
-
-       switch (c2h_cmd_id) {
-       case C2H_DBG:
-               RT_TRACE(rtlpriv, COMP_FW, DBG_TRACE,
-                        "[C2H], C2H_8723BE_DBG!!\n");
-               break;
-       case C2H_TX_REPORT:
-               RT_TRACE(rtlpriv, COMP_FW, DBG_TRACE,
-                        "[C2H], C2H_8723BE_TX_REPORT!\n");
-               rtl_tx_report_handler(hw, tmp_buf, c2h_cmd_len);
-               break;
-       case C2H_BT_INFO:
-               RT_TRACE(rtlpriv, COMP_FW, DBG_TRACE,
-                        "[C2H], C2H_8723BE_BT_INFO!!\n");
-               if (rtlpriv->cfg->ops->get_btc_status())
-                       btc_ops->btc_btinfo_notify(rtlpriv, tmp_buf,
-                                                  c2h_cmd_len);
-               break;
-       case C2H_BT_MP:
-               RT_TRACE(rtlpriv, COMP_FW, DBG_TRACE,
-                        "[C2H], C2H_8723BE_BT_MP!!\n");
-               if (rtlpriv->cfg->ops->get_btc_status())
-                       btc_ops->btc_btmpinfo_notify(rtlpriv, tmp_buf,
-                                                    c2h_cmd_len);
-               break;
-       default:
-               RT_TRACE(rtlpriv, COMP_FW, DBG_TRACE,
-                        "[C2H], Unknown packet!! CmdId(%#X)!\n", c2h_cmd_id);
-               break;
-       }
-}
-
-void rtl8723be_c2h_packet_handler(struct ieee80211_hw *hw, u8 *buffer, u8 len)
-{
-       struct rtl_priv *rtlpriv = rtl_priv(hw);
-       u8 c2h_cmd_id = 0, c2h_cmd_seq = 0, c2h_cmd_len = 0;
-       u8 *tmp_buf = NULL;
-
-       c2h_cmd_id = buffer[0];
-       c2h_cmd_seq = buffer[1];
-       c2h_cmd_len = len - 2;
-       tmp_buf = buffer + 2;
-
-       RT_TRACE(rtlpriv, COMP_FW, DBG_TRACE,
-                "[C2H packet], c2hCmdId=0x%x, c2hCmdSeq=0x%x, c2hCmdLen=%d\n",
-                c2h_cmd_id, c2h_cmd_seq, c2h_cmd_len);
-
-       RT_PRINT_DATA(rtlpriv, COMP_FW, DBG_TRACE,
-                     "[C2H packet], Content Hex:\n", tmp_buf, c2h_cmd_len);
-
-       switch (c2h_cmd_id) {
-       case C2H_BT_INFO:
-       case C2H_BT_MP:
-               rtl_c2hcmd_enqueue(hw, c2h_cmd_id, c2h_cmd_len, tmp_buf);
-               break;
-
-       default:
-               rtl8723be_c2h_content_parsing(hw, c2h_cmd_id, c2h_cmd_len,
-                                             tmp_buf);
-               break;
-       }
-}

diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8723be/fw.h b/drivers/net/wireless/realtek/rtlwifi/rtl8723be/fw.h
index 8f49941028f4b022b5485a374540e147cb75ba69..948d286463649f57ac08214a5f829715095f89be 100644 (file)
--- a/drivers/net/wireless/realtek/rtlwifi/rtl8723be/fw.h
+++ b/drivers/net/wireless/realtek/rtlwifi/rtl8723be/fw.h
@@ -143,7 +143,4 @@ void rtl8723be_set_fw_pwrmode_cmd(struct ieee80211_hw *hw, u8 mode);
 void rtl8723be_set_fw_media_status_rpt_cmd(struct ieee80211_hw *hw, u8 mstatus);
 void rtl8723be_set_fw_rsvdpagepkt(struct ieee80211_hw *hw, bool b_dl_finished);
 void rtl8723be_set_p2p_ps_offload_cmd(struct ieee80211_hw *hw, u8 p2p_ps_state);
-void rtl8723be_c2h_packet_handler(struct ieee80211_hw *hw, u8 *buffer, u8 len);
-void rtl8723be_c2h_content_parsing(struct ieee80211_hw *hw, u8 c2h_cmd_id,
-                                  u8 c2h_cmd_len, u8 *tmp_buf);
 #endif

diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8723be/sw.c b/drivers/net/wireless/realtek/rtlwifi/rtl8723be/sw.c
index 6a42988aad6592852dbd7e2c12eb20ed2f648183..9df994965c4af193c984226aa0ea0bb7d60be020 100644 (file)
--- a/drivers/net/wireless/realtek/rtlwifi/rtl8723be/sw.c
+++ b/drivers/net/wireless/realtek/rtlwifi/rtl8723be/sw.c
@@ -263,7 +263,7 @@ static struct rtl_hal_ops rtl8723be_hal_ops = {
        .get_btc_status = rtl8723be_get_btc_status,
        .rx_command_packet = rtl8723be_rx_command_packet,
        .is_fw_header = is_fw_header,
-       .c2h_content_parsing = rtl8723be_c2h_content_parsing,
+       .c2h_content_parsing = rtl_c2h_content_parsing,
 };
 
 static struct rtl_mod_params rtl8723be_mod_params = {

diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8723be/trx.c b/drivers/net/wireless/realtek/rtlwifi/rtl8723be/trx.c
index deb8f9501b51023543897f21fb15e7ba5c793180..0c0cece9d5f9d3dbf4824078e56ce9a1b6ea1c9c 100644 (file)
--- a/drivers/net/wireless/realtek/rtlwifi/rtl8723be/trx.c
+++ b/drivers/net/wireless/realtek/rtlwifi/rtl8723be/trx.c
@@ -774,8 +774,7 @@ u32 rtl8723be_rx_command_packet(struct ieee80211_hw *hw,
                        result = 0;
                        break;
        case C2H_PACKET:
-                       rtl8723be_c2h_packet_handler(hw, skb->data,
-                                                    (u8)skb->len);
+                       rtl_c2h_packet_handler(hw, skb->data, (u8)skb->len);
                        result = 1;
                        break;
        default:

diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8821ae/fw.c b/drivers/net/wireless/realtek/rtlwifi/rtl8821ae/fw.c
index bf37c428c682241129f1db96022b73a2caedc41b..d868a034659fb88660cc2104a915296022f6ce3f 100644 (file)
--- a/drivers/net/wireless/realtek/rtlwifi/rtl8821ae/fw.c
+++ b/drivers/net/wireless/realtek/rtlwifi/rtl8821ae/fw.c
@@ -1917,71 +1917,3 @@ void rtl8821ae_c2h_ra_report_handler(struct ieee80211_hw *hw,
 
        rtl8821ae_dm_update_init_rate(hw, rate);
 }
-
-void rtl8821ae_c2h_content_parsing(struct ieee80211_hw *hw,
-                                  u8 c2h_cmd_id, u8 c2h_cmd_len,
-                                  u8 *tmp_buf)
-{
-       struct rtl_priv *rtlpriv = rtl_priv(hw);
-       struct rtl_hal_ops *hal_ops = rtlpriv->cfg->ops;
-       struct rtl_btc_ops *btc_ops = rtlpriv->btcoexist.btc_ops;
-
-       switch (c2h_cmd_id) {
-       case C2H_DBG:
-               RT_TRACE(rtlpriv, COMP_FW, DBG_LOUD, "[C2H], C2H_8812_DBG!!\n");
-               break;
-       case C2H_TX_REPORT:
-               rtl_tx_report_handler(hw, tmp_buf, c2h_cmd_len);
-               break;
-       case C2H_RA_RPT:
-               hal_ops->c2h_ra_report_handler(hw, tmp_buf, c2h_cmd_len);
-               break;
-       case C2H_BT_INFO:
-               RT_TRACE(rtlpriv, COMP_FW, DBG_LOUD,
-                        "[C2H], C2H_8812_BT_INFO!!\n");
-               if (rtlpriv->cfg->ops->get_btc_status())
-                       btc_ops->btc_btinfo_notify(rtlpriv, tmp_buf,
-                                                  c2h_cmd_len);
-               break;
-       case C2H_BT_MP:
-               RT_TRACE(rtlpriv, COMP_FW, DBG_TRACE,
-                        "[C2H], C2H_8812_BT_MP!!\n");
-               if (rtlpriv->cfg->ops->get_btc_status())
-                       btc_ops->btc_btmpinfo_notify(rtlpriv, tmp_buf,
-                                                    c2h_cmd_len);
-               break;
-       default:
-               break;
-       }
-}
-
-void rtl8821ae_c2h_packet_handler(struct ieee80211_hw *hw, u8 *buffer,
-                                 u8 length)
-{
-       struct rtl_priv *rtlpriv = rtl_priv(hw);
-       u8 c2h_cmd_id = 0, c2h_cmd_seq = 0, c2h_cmd_len = 0;
-       u8 *tmp_buf = NULL;
-
-       c2h_cmd_id = buffer[0];
-       c2h_cmd_seq = buffer[1];
-       c2h_cmd_len = length - 2;
-       tmp_buf = buffer + 2;
-
-       RT_TRACE(rtlpriv, COMP_FW, DBG_LOUD,
-                "[C2H packet], c2hCmdId=0x%x, c2hCmdSeq=0x%x, c2hCmdLen=%d\n",
-                c2h_cmd_id, c2h_cmd_seq, c2h_cmd_len);
-
-       RT_PRINT_DATA(rtlpriv, COMP_FW, DBG_LOUD,
-                     "[C2H packet], Content Hex:\n", tmp_buf, c2h_cmd_len);
-
-       switch (c2h_cmd_id) {
-       case C2H_BT_INFO:
-               rtl_c2hcmd_enqueue(hw, c2h_cmd_id, c2h_cmd_len, tmp_buf);
-               break;
-
-       default:
-               rtl8821ae_c2h_content_parsing(hw, c2h_cmd_id, c2h_cmd_len,
-                                             tmp_buf);
-               break;
-       }
-}

diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8821ae/fw.h b/drivers/net/wireless/realtek/rtlwifi/rtl8821ae/fw.h
index a69448be7c266a9fdc23522399751bef58417889..99c902ff0b84c75ea2d09272464a82beffd6cd61 100644 (file)
--- a/drivers/net/wireless/realtek/rtlwifi/rtl8821ae/fw.h
+++ b/drivers/net/wireless/realtek/rtlwifi/rtl8821ae/fw.h
@@ -317,11 +317,6 @@ void rtl8821ae_set_fw_keep_alive_cmd(struct ieee80211_hw *hw, bool func_en);
 void rtl8821ae_set_fw_disconnect_decision_ctrl_cmd(struct ieee80211_hw *hw,
                                                   bool enabled);
 void rtl8821ae_set_fw_global_info_cmd(struct ieee80211_hw *hw);
-void rtl8821ae_c2h_packet_handler(struct ieee80211_hw *hw,
-                                 u8 *buffer, u8 length);
-void rtl8821ae_c2h_content_parsing(struct ieee80211_hw *hw,
-                                  u8 c2h_cmd_id, u8 c2h_cmd_len,
-                                  u8 *tmp_buf);
 void rtl8821ae_c2h_ra_report_handler(struct ieee80211_hw *hw,
                                     u8 *cmd_buf, u8 cmd_len);
 #endif

diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8821ae/sw.c b/drivers/net/wireless/realtek/rtlwifi/rtl8821ae/sw.c
index 4b2cb6bda4f1944870b78274211ac86dbe1097b3..bcabf4dc6353e734abff1c1f4980acad1d499602 100644 (file)
--- a/drivers/net/wireless/realtek/rtlwifi/rtl8821ae/sw.c
+++ b/drivers/net/wireless/realtek/rtlwifi/rtl8821ae/sw.c
@@ -304,7 +304,7 @@ static struct rtl_hal_ops rtl8821ae_hal_ops = {
        .fill_h2c_cmd = rtl8821ae_fill_h2c_cmd,
        .get_btc_status = rtl8821ae_get_btc_status,
        .rx_command_packet = rtl8821ae_rx_command_packet,
-       .c2h_content_parsing = rtl8821ae_c2h_content_parsing,
+       .c2h_content_parsing = rtl_c2h_content_parsing,
        .c2h_ra_report_handler = rtl8821ae_c2h_ra_report_handler,
        .add_wowlan_pattern = rtl8821ae_add_wowlan_pattern,
 };

diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8821ae/trx.c b/drivers/net/wireless/realtek/rtlwifi/rtl8821ae/trx.c
index 63fb80039f824096d509751e009a619ea15aa6a4..a93d8569c1862a95167d4c6f5055d699559bb6e5 100644 (file)
--- a/drivers/net/wireless/realtek/rtlwifi/rtl8821ae/trx.c
+++ b/drivers/net/wireless/realtek/rtlwifi/rtl8821ae/trx.c
@@ -1018,7 +1018,7 @@ u32 rtl8821ae_rx_command_packet(struct ieee80211_hw *hw,
                result = 0;
                break;
        case C2H_PACKET:
-               rtl8821ae_c2h_packet_handler(hw, skb->data, (u8)skb->len);
+               rtl_c2h_packet_handler(hw, skb->data, (u8)skb->len);
                result = 1;
                RT_TRACE(rtlpriv, COMP_RECV, DBG_LOUD,
                         "skb->len=%d\n\n", skb->len);