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

Commit c8c24872 authored by Wey-Yi Guy's avatar Wey-Yi Guy Committed by John W. Linville
Browse files

iwlwifi: increase max tfd payload size 



Increase the size of TFD_MAX_PAYLOAD_SIZE (the size of iwl_device_cmd)
to accommodate iwl6000_channel_switch_cmd data structure.

Signed-off-by: default avatarWey-Yi Guy <wey-yi.w.guy@intel.com>
Acked-by: default avatarBen Cahill <ben.m.cahill@intel.com>
Signed-off-by: default avatarReinette Chatre <reinette.chatre@intel.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 29b1b268

drivers/net/wireless/iwlwifi/iwl-dev.h

+8 −3
Original line number Diff line number Diff line
@@ -364,7 +364,7 @@ enum { 
	CMD_WANT_SKB = (1 << 2),

};



#define IWL_CMD_MAX_PAYLOAD 320

#define DEF_CMD_PAYLOAD_SIZE 320



/*

 * IWL_LINK_HDR_MAX should include ieee80211_hdr, radiotap header,
@@ -388,7 +388,8 @@ struct iwl_device_cmd { 
		u16 val16;

		u32 val32;

		struct iwl_tx_cmd tx;

		u8 payload[IWL_CMD_MAX_PAYLOAD];

		struct iwl6000_channel_switch_cmd chswitch;

		u8 payload[DEF_CMD_PAYLOAD_SIZE];

	} __attribute__ ((packed)) cmd;

} __attribute__ ((packed));
@@ -741,7 +742,11 @@ static inline int iwl_queue_used(const struct iwl_queue *q, int i) 


static inline u8 get_cmd_index(struct iwl_queue *q, u32 index, int is_huge)

{

	/* This is for scan command, the big buffer at end of command array */

	/*

	 * This is for init calibration result and scan command which

	 * required buffer > TFD_MAX_PAYLOAD_SIZE,

	 * the big buffer at end of command array

	 */

	if (is_huge)

		return q->n_window;	/* must be power of 2 */