diff options
| author | Ping-Ke Shih <pkshih@realtek.com> | 2018-05-18 17:29:58 +0800 |
|---|---|---|
| committer | Kalle Valo <kvalo@codeaurora.org> | 2018-05-29 10:16:43 +0300 |
| commit | 7aeb100b7d70973e1478f472b0a2fc569637ec8d (patch) | |
| tree | 405f60ef187fb574bf6ecf9723df2362dbc38cbb /drivers/net/wireless/realtek/rtlwifi/rtl8192ee | |
| parent | 249155973f524a284a86582ff9a915be045ab760 (diff) | |
rtlwifi: remove duplicate C2H definition
Move C2H definition to wifi.h, because the definitions of 8192ee, 8723be
and 8821ae are the same.
Signed-off-by: Ping-Ke Shih <pkshih@realtek.com>
Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
Diffstat (limited to 'drivers/net/wireless/realtek/rtlwifi/rtl8192ee')
| -rw-r--r-- | drivers/net/wireless/realtek/rtlwifi/rtl8192ee/fw.c | 16 | ||||
| -rw-r--r-- | drivers/net/wireless/realtek/rtlwifi/rtl8192ee/fw.h | 11 |
2 files changed, 8 insertions, 19 deletions
diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8192ee/fw.c b/drivers/net/wireless/realtek/rtlwifi/rtl8192ee/fw.c index f9563ae301ad..25d6c32f66c3 100644 --- a/drivers/net/wireless/realtek/rtlwifi/rtl8192ee/fw.c +++ b/drivers/net/wireless/realtek/rtlwifi/rtl8192ee/fw.c @@ -892,34 +892,34 @@ void rtl92ee_c2h_content_parsing(struct ieee80211_hw *hw, u8 c2h_cmd_id, struct rtl_btc_ops *btc_ops = rtlpriv->btcoexist.btc_ops; switch (c2h_cmd_id) { - case C2H_8192E_DBG: + case C2H_DBG: RT_TRACE(rtlpriv, COMP_FW, DBG_TRACE, "[C2H], C2H_8723BE_DBG!!\n"); break; - case C2H_8192E_TXBF: + case C2H_TXBF: RT_TRACE(rtlpriv, COMP_FW, DBG_TRACE, "[C2H], C2H_8192E_TXBF!!\n"); break; - case C2H_8192E_TX_REPORT: + 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_8192E_BT_INFO: + 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_8192E_BT_MP: + 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_8192E_RA_RPT: + case C2H_RA_RPT: _rtl92ee_c2h_ra_report_handler(hw, tmp_buf, c2h_cmd_len); break; default: @@ -948,8 +948,8 @@ void rtl92ee_c2h_packet_handler(struct ieee80211_hw *hw, u8 *buffer, u8 len) "[C2H packet], Content Hex:\n", tmp_buf, c2h_cmd_len); switch (c2h_cmd_id) { - case C2H_8192E_BT_INFO: - case C2H_8192E_BT_MP: + case C2H_BT_INFO: + case C2H_BT_MP: rtl_c2hcmd_enqueue(hw, c2h_cmd_id, c2h_cmd_len, tmp_buf); break; default: diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8192ee/fw.h b/drivers/net/wireless/realtek/rtlwifi/rtl8192ee/fw.h index b770f722daa6..8325adaa9663 100644 --- a/drivers/net/wireless/realtek/rtlwifi/rtl8192ee/fw.h +++ b/drivers/net/wireless/realtek/rtlwifi/rtl8192ee/fw.h @@ -128,17 +128,6 @@ enum rtl8192e_h2c_cmd { MAX_92E_H2CCMD }; -enum rtl8192e_c2h_evt { - C2H_8192E_DBG = 0, - C2H_8192E_LB = 1, - C2H_8192E_TXBF = 2, - C2H_8192E_TX_REPORT = 3, - C2H_8192E_BT_INFO = 9, - C2H_8192E_BT_MP = 11, - C2H_8192E_RA_RPT = 12, - MAX_8192E_C2HEVENT -}; - #define pagenum_128(_len) \ (u32)(((_len) >> 7) + ((_len) & 0x7F ? 1 : 0)) |