Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 23ffab17 authored by Ping-Ke Shih's avatar Ping-Ke Shih Committed by Kalle Valo
Browse files

rtlwifi: remove hal_op rx_command_packet 



Because the hal_op rx_command_packet does C2H handler if rx packet type
is C2H, and the handler have been moved to base.c so we can call the
handler directly.

Signed-off-by: default avatarPing-Ke Shih <pkshih@realtek.com>
Signed-off-by: default avatarKalle Valo <kvalo@codeaurora.org>
parent daf026ae

drivers/net/wireless/realtek/rtlwifi/pci.c

+2 −2
Original line number Diff line number Diff line
@@ -830,8 +830,8 @@ static void _rtl_pci_rx_interrupt(struct ieee80211_hw *hw) 
			goto new_trx_end;

		}

		/* handle command packet here */

		if (rtlpriv->cfg->ops->rx_command_packet &&

		    rtlpriv->cfg->ops->rx_command_packet(hw, &stats, skb)) {

		if (stats.packet_report_type == C2H_PACKET) {

			rtl_c2h_packet_handler(hw, skb->data, (u8)skb->len);

			dev_kfree_skb_any(skb);

			goto new_trx_end;

		}

drivers/net/wireless/realtek/rtlwifi/rtl8192ee/sw.c

+0 −1
Original line number Diff line number Diff line
@@ -250,7 +250,6 @@ static struct rtl_hal_ops rtl8192ee_hal_ops = { 
	.set_rfreg = rtl92ee_phy_set_rf_reg,

	.fill_h2c_cmd = rtl92ee_fill_h2c_cmd,

	.get_btc_status = rtl92ee_get_btc_status,

	.rx_command_packet = rtl92ee_rx_command_packet,

	.c2h_content_parsing = rtl_c2h_content_parsing,

	.c2h_ra_report_handler = rtl92ee_c2h_ra_report_handler,

};

drivers/net/wireless/realtek/rtlwifi/rtl8192ee/trx.c

+0 −24
Original line number Diff line number Diff line
@@ -1072,27 +1072,3 @@ bool rtl92ee_is_tx_desc_closed(struct ieee80211_hw *hw, u8 hw_queue, u16 index) 
void rtl92ee_tx_polling(struct ieee80211_hw *hw, u8 hw_queue)

{

}
 


u32 rtl92ee_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:

		rtl_c2h_packet_handler(hw, skb->data, (u8)skb->len);

		result = 1;

		break;

	default:

		RT_TRACE(rtlpriv, COMP_RECV, DBG_TRACE,

			 "Unknown packet type %d\n", status->packet_report_type);

		break;

	}



	return result;

}

drivers/net/wireless/realtek/rtlwifi/rtl8192ee/trx.h

+0 −3
Original line number Diff line number Diff line
@@ -762,7 +762,4 @@ void rtl92ee_tx_polling(struct ieee80211_hw *hw, u8 hw_queue); 
void rtl92ee_tx_fill_cmddesc(struct ieee80211_hw *hw, u8 *pdesc,

			     bool firstseg, bool lastseg,

			     struct sk_buff *skb);

u32 rtl92ee_rx_command_packet(struct ieee80211_hw *hw,

			      const struct rtl_stats *status,

			      struct sk_buff *skb);

#endif

drivers/net/wireless/realtek/rtlwifi/rtl8723be/sw.c

+0 −1
Original line number Diff line number Diff line
@@ -261,7 +261,6 @@ static struct rtl_hal_ops rtl8723be_hal_ops = { 
	.set_rfreg = rtl8723be_phy_set_rf_reg,

	.fill_h2c_cmd = rtl8723be_fill_h2c_cmd,

	.get_btc_status = rtl8723be_get_btc_status,

	.rx_command_packet = rtl8723be_rx_command_packet,

	.is_fw_header = is_fw_header,

	.c2h_content_parsing = rtl_c2h_content_parsing,

};