Commit 46190882 authored by Dmitry Antipov's avatar Dmitry Antipov Committed by Kalle Valo
Browse files

wifi: rtlwifi: simplify TX command fill callbacks 



Since 'rtlpriv->cfg->ops->fill_tx_cmddesc()' is always called
with 'firstseg' and 'lastseg' set to 1 (and the latter is
never actually used), all of the relevant chip-specific
routines may be simplified. Compile tested only.

Signed-off-by: default avatarDmitry Antipov <dmantipov@yandex.ru>
Acked-by: default avatarPing-Ke Shih <pkshih@realtek.com>
Signed-off-by: default avatarKalle Valo <kvalo@kernel.org>
Link: https://lore.kernel.org/r/20231011154442.52457-2-dmantipov@yandex.ru
parent f35ccb65

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

+1 −1
Original line number Diff line number Diff line
@@ -1897,7 +1897,7 @@ bool rtl_cmd_send_packet(struct ieee80211_hw *hw, struct sk_buff *skb) 
	/*this is wrong, fill_tx_cmddesc needs update*/

	pdesc = &ring->desc[0];



	rtlpriv->cfg->ops->fill_tx_cmddesc(hw, (u8 *)pdesc, 1, 1, skb);

	rtlpriv->cfg->ops->fill_tx_cmddesc(hw, (u8 *)pdesc, skb);



	__skb_queue_tail(&ring->queue, skb);

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

+3 −5
Original line number Diff line number Diff line
@@ -665,9 +665,8 @@ void rtl88ee_tx_fill_desc(struct ieee80211_hw *hw, 
	rtl_dbg(rtlpriv, COMP_SEND, DBG_TRACE, "\n");

}



void rtl88ee_tx_fill_cmddesc(struct ieee80211_hw *hw,

			     u8 *pdesc8, bool firstseg,

			     bool lastseg, struct sk_buff *skb)

void rtl88ee_tx_fill_cmddesc(struct ieee80211_hw *hw, u8 *pdesc8,

			     struct sk_buff *skb)

{

	struct rtl_priv *rtlpriv = rtl_priv(hw);

	struct rtl_pci *rtlpci = rtl_pcidev(rtl_pcipriv(hw));
@@ -687,7 +686,6 @@ void rtl88ee_tx_fill_cmddesc(struct ieee80211_hw *hw, 
	}

	clear_pci_tx_desc_content(pdesc, TX_DESC_SIZE);



	if (firstseg)

	set_tx_desc_offset(pdesc, USB_HWDESC_HEADER_LEN);



	set_tx_desc_tx_rate(pdesc, DESC92C_RATE1M);

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

+0 −1
Original line number Diff line number Diff line
@@ -797,6 +797,5 @@ bool rtl88ee_is_tx_desc_closed(struct ieee80211_hw *hw, 
			       u8 hw_queue, u16 index);

void rtl88ee_tx_polling(struct ieee80211_hw *hw, u8 hw_queue);

void rtl88ee_tx_fill_cmddesc(struct ieee80211_hw *hw, u8 *pdesc,

			     bool firstseg, bool lastseg,

			     struct sk_buff *skb);

#endif

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

+3 −6
Original line number Diff line number Diff line
@@ -518,9 +518,8 @@ void rtl92ce_tx_fill_desc(struct ieee80211_hw *hw, 
	rtl_dbg(rtlpriv, COMP_SEND, DBG_TRACE, "\n");

}



void rtl92ce_tx_fill_cmddesc(struct ieee80211_hw *hw,

			     u8 *pdesc8, bool firstseg,

			     bool lastseg, struct sk_buff *skb)

void rtl92ce_tx_fill_cmddesc(struct ieee80211_hw *hw, u8 *pdesc8,

			     struct sk_buff *skb)

{

	struct rtl_priv *rtlpriv = rtl_priv(hw);

	struct rtl_pci *rtlpci = rtl_pcidev(rtl_pcipriv(hw));
@@ -540,9 +539,7 @@ void rtl92ce_tx_fill_cmddesc(struct ieee80211_hw *hw, 
	}

	clear_pci_tx_desc_content(pdesc, TX_DESC_SIZE);



	if (firstseg)

	set_tx_desc_offset(pdesc, USB_HWDESC_HEADER_LEN);



	set_tx_desc_tx_rate(pdesc, DESC_RATE1M);



	set_tx_desc_seq(pdesc, 0);

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

+0 −1
Original line number Diff line number Diff line
@@ -527,6 +527,5 @@ bool rtl92ce_is_tx_desc_closed(struct ieee80211_hw *hw, 
			       u8 hw_queue, u16 index);

void rtl92ce_tx_polling(struct ieee80211_hw *hw, u8 hw_queue);

void rtl92ce_tx_fill_cmddesc(struct ieee80211_hw *hw, u8 *pdesc,

			     bool b_firstseg, bool b_lastseg,

			     struct sk_buff *skb);

#endif