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

Commit b59415c2 authored by Jes Sorensen's avatar Jes Sorensen Committed by Kalle Valo
Browse files

rtl8xxxu: Split filling of TX descriptors into separate functions 



Split the filling of TX descriptors into a generic portion used on all
devices, and format specific helper functions provided in the fops
structure.

This also cleaned up some mess, even if non harmful, in the handling
of txdesc40 descriptors, where the code randomly would switch between
the pointer to tx_desc and tx_desc40.

Signed-off-by: default avatarJes Sorensen <Jes.Sorensen@redhat.com>
Signed-off-by: default avatarKalle Valo <kvalo@codeaurora.org>
parent 99afaac4

drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu.h

+12 −0
Original line number Diff line number Diff line
@@ -1336,6 +1336,10 @@ struct rtl8xxxu_fileops { 
				  u32 ramask, int sgi);

	void (*report_connect) (struct rtl8xxxu_priv *priv,

				u8 macid, bool connect);

	void (*fill_txdesc) (struct ieee80211_hdr *hdr,

			     struct rtl8xxxu_txdesc32 *tx_desc, u32 rate,

			     u16 rate_flag, bool sgi, bool short_preamble,

			     bool ampdu_enable);

	int writeN_block_size;

	int rx_agg_buf_size;

	char tx_desc_size;
@@ -1429,6 +1433,14 @@ int rtl8xxxu_parse_rxdesc24(struct rtl8xxxu_priv *priv, struct sk_buff *skb); 
int rtl8xxxu_gen2_channel_to_group(int channel);

bool rtl8xxxu_gen2_simularity_compare(struct rtl8xxxu_priv *priv,

				      int result[][8], int c1, int c2);

void rtl8xxxu_fill_txdesc_v1(struct ieee80211_hdr *hdr,

			     struct rtl8xxxu_txdesc32 *tx_desc, u32 rate,

			     u16 rate_flag, bool sgi, bool short_preamble,

			     bool ampdu_enable);

void rtl8xxxu_fill_txdesc_v2(struct ieee80211_hdr *hdr,

			     struct rtl8xxxu_txdesc32 *tx_desc32, u32 rate,

			     u16 rate_flag, bool sgi, bool short_preamble,

			     bool ampdu_enable);



extern struct rtl8xxxu_fileops rtl8192cu_fops;

extern struct rtl8xxxu_fileops rtl8192eu_fops;

drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_8192c.c

+1 −0
Original line number Diff line number Diff line
@@ -567,6 +567,7 @@ struct rtl8xxxu_fileops rtl8192cu_fops = { 
	.set_tx_power = rtl8xxxu_gen1_set_tx_power,

	.update_rate_mask = rtl8xxxu_update_rate_mask,

	.report_connect = rtl8xxxu_gen1_report_connect,

	.fill_txdesc = rtl8xxxu_fill_txdesc_v1,

	.writeN_block_size = 128,

	.rx_agg_buf_size = 16000,

	.tx_desc_size = sizeof(struct rtl8xxxu_txdesc32),

drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_8192e.c

+1 −0
Original line number Diff line number Diff line
@@ -1501,6 +1501,7 @@ struct rtl8xxxu_fileops rtl8192eu_fops = { 
	.set_tx_power = rtl8192e_set_tx_power,

	.update_rate_mask = rtl8xxxu_gen2_update_rate_mask,

	.report_connect = rtl8xxxu_gen2_report_connect,

	.fill_txdesc = rtl8xxxu_fill_txdesc_v2,

	.writeN_block_size = 128,

	.tx_desc_size = sizeof(struct rtl8xxxu_txdesc40),

	.rx_desc_size = sizeof(struct rtl8xxxu_rxdesc24),

drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_8723a.c

+1 −0
Original line number Diff line number Diff line
@@ -384,6 +384,7 @@ struct rtl8xxxu_fileops rtl8723au_fops = { 
	.set_tx_power = rtl8xxxu_gen1_set_tx_power,

	.update_rate_mask = rtl8xxxu_update_rate_mask,

	.report_connect = rtl8xxxu_gen1_report_connect,

	.fill_txdesc = rtl8xxxu_fill_txdesc_v1,

	.writeN_block_size = 1024,

	.rx_agg_buf_size = 16000,

	.tx_desc_size = sizeof(struct rtl8xxxu_txdesc32),

drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_8723b.c

+1 −0
Original line number Diff line number Diff line
@@ -1662,6 +1662,7 @@ struct rtl8xxxu_fileops rtl8723bu_fops = { 
	.set_tx_power = rtl8723b_set_tx_power,

	.update_rate_mask = rtl8xxxu_gen2_update_rate_mask,

	.report_connect = rtl8xxxu_gen2_report_connect,

	.fill_txdesc = rtl8xxxu_fill_txdesc_v2,

	.writeN_block_size = 1024,

	.tx_desc_size = sizeof(struct rtl8xxxu_txdesc40),

	.rx_desc_size = sizeof(struct rtl8xxxu_rxdesc24),