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

Commit 58d94976 authored by qctecmdr Service's avatar qctecmdr Service Committed by Gerrit - the friendly Code Review server
Browse files

Merge "wil6210: enable AMSDU by default"

parents 2066b4e7 c2cd870b

drivers/net/wireless/ath/wil6210/debugfs.c

+1 −0
Original line number Diff line number Diff line
@@ -2165,6 +2165,7 @@ static const struct dbg_off dbg_wil_off[] = { 
	WIL_FIELD(wakeup_trigger, 0644,		doff_u8),

	WIL_FIELD(ring_idle_trsh, 0644,	doff_u32),

	WIL_FIELD(num_rx_status_rings, 0644,	doff_u8),

	WIL_FIELD(amsdu_en, 0644,	doff_u8),

	{},

};

drivers/net/wireless/ath/wil6210/main.c

+2 −0
Original line number Diff line number Diff line
@@ -653,6 +653,8 @@ int wil_priv_init(struct wil6210_priv *wil) 
	/* num of rx srings can be updated via debugfs before allocation */

	wil->num_rx_status_rings = WIL_DEFAULT_NUM_RX_STATUS_RINGS;



	wil->amsdu_en = 1;



	return 0;



out_wmi_wq:

drivers/net/wireless/ath/wil6210/wil6210.h

+3 −0
Original line number Diff line number Diff line
@@ -1004,6 +1004,9 @@ struct wil6210_priv { 


	bool secured_boot;

	u8 boot_config;



	/* relevant only for eDMA */

	bool amsdu_en;

};



#define wil_to_wiphy(i) (i->wiphy)

drivers/net/wireless/ath/wil6210/wmi.c

+2 −6
Original line number Diff line number Diff line
@@ -39,10 +39,6 @@ module_param(led_id, byte, 0444); 
MODULE_PARM_DESC(led_id,

		 " 60G device led enablement. Set the led ID (0-2) to enable");



static bool amsdu_en;

module_param(amsdu_en, bool, 0444);

MODULE_PARM_DESC(amsdu_en, " enable A-MSDU, default: false");



#define WIL_WAIT_FOR_SUSPEND_RESUME_COMP 200

#define WIL_WMI_CALL_GENERAL_TO_MS 100
@@ -2153,8 +2149,8 @@ int wmi_addba(struct wil6210_priv *wil, u8 mid, 
	      u8 ringid, u8 size, u16 timeout)

{

	u8 amsdu = wil->use_enhanced_dma_hw && use_rx_hw_reordering &&

		amsdu_en ? 1 : 0;



		test_bit(WMI_FW_CAPABILITY_AMSDU, wil->fw_capabilities) &&

		wil->amsdu_en;

	struct wmi_ring_ba_en_cmd cmd = {

		.ring_id = ringid,

		.agg_max_wsize = size,

drivers/net/wireless/ath/wil6210/wmi.h

+1 −0
Original line number Diff line number Diff line
@@ -74,6 +74,7 @@ enum wmi_fw_capability { 
	WMI_FW_CAPABILITY_PNO				= 15,

	WMI_FW_CAPABILITY_CONNECT_SNR_THR		= 16,

	WMI_FW_CAPABILITY_REF_CLOCK_CONTROL		= 18,

	WMI_FW_CAPABILITY_AMSDU				= 23,

	WMI_FW_CAPABILITY_MAX,

};