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

Commit 41effc2a authored by Johannes Berg's avatar Johannes Berg
Browse files

Merge remote-tracking branch 'iwlwifi-fixes/master' into HEAD 



This is needed to resolve some conflicts that would otherwise
happen between wireless-next and the code here.

Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
parents 6dbe51c2 2470b36e

drivers/net/wireless/iwlwifi/dvm/sta.c

+1 −1
Original line number Diff line number Diff line
@@ -151,7 +151,7 @@ int iwl_send_add_sta(struct iwl_priv *priv, 
		       sta_id, sta->sta.addr, flags & CMD_ASYNC ?  "a" : "");



	if (!(flags & CMD_ASYNC)) {

		cmd.flags |= CMD_WANT_SKB | CMD_WANT_HCMD;

		cmd.flags |= CMD_WANT_SKB;

		might_sleep();

	}

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

+5 −7
Original line number Diff line number Diff line
@@ -349,25 +349,23 @@ TRACE_EVENT(iwlwifi_dev_rx_data, 
TRACE_EVENT(iwlwifi_dev_hcmd,

	TP_PROTO(const struct device *dev,

		 struct iwl_host_cmd *cmd, u16 total_size,

		 const void *hdr, size_t hdr_len),

	TP_ARGS(dev, cmd, total_size, hdr, hdr_len),

		 struct iwl_cmd_header *hdr),

	TP_ARGS(dev, cmd, total_size, hdr),

	TP_STRUCT__entry(

		DEV_ENTRY

		__dynamic_array(u8, hcmd, total_size)

		__field(u32, flags)

	),

	TP_fast_assign(

		int i, offset = hdr_len;

		int i, offset = sizeof(*hdr);



		DEV_ASSIGN;

		__entry->flags = cmd->flags;

		memcpy(__get_dynamic_array(hcmd), hdr, hdr_len);

		memcpy(__get_dynamic_array(hcmd), hdr, sizeof(*hdr));



		for (i = 0; i < IWL_MAX_CMD_TFDS; i++) {

		for (i = 0; i < IWL_MAX_CMD_TBS_PER_TFD; i++) {

			if (!cmd->len[i])

				continue;

			if (!(cmd->dataflags[i] & IWL_HCMD_DFL_NOCOPY))

				continue;

			memcpy((u8 *)__get_dynamic_array(hcmd) + offset,

			       cmd->data[i], cmd->len[i]);

			offset += cmd->len[i];

drivers/net/wireless/iwlwifi/iwl-drv.c

+1 −2
Original line number Diff line number Diff line
@@ -1102,7 +1102,6 @@ void iwl_drv_stop(struct iwl_drv *drv) 


/* shared module parameters */

struct iwl_mod_params iwlwifi_mod_params = {

	.amsdu_size_8K = 1,

	.restart_fw = 1,

	.plcp_check = true,

	.bt_coex_active = true,
@@ -1207,7 +1206,7 @@ MODULE_PARM_DESC(11n_disable, 
	"disable 11n functionality, bitmap: 1: full, 2: agg TX, 4: agg RX");

module_param_named(amsdu_size_8K, iwlwifi_mod_params.amsdu_size_8K,

		   int, S_IRUGO);

MODULE_PARM_DESC(amsdu_size_8K, "enable 8K amsdu size");

MODULE_PARM_DESC(amsdu_size_8K, "enable 8K amsdu size (default 0)");

module_param_named(fw_restart, iwlwifi_mod_params.restart_fw, int, S_IRUGO);

MODULE_PARM_DESC(fw_restart, "restart firmware in case of error");

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

+1 −1
Original line number Diff line number Diff line
@@ -91,7 +91,7 @@ enum iwl_power_level { 
 * @sw_crypto: using hardware encryption, default = 0

 * @disable_11n: disable 11n capabilities, default = 0,

 *	use IWL_DISABLE_HT_* constants

 * @amsdu_size_8K: enable 8K amsdu size, default = 1

 * @amsdu_size_8K: enable 8K amsdu size, default = 0

 * @restart_fw: restart firmware, default = 1

 * @plcp_check: enable plcp health check, default = true

 * @wd_disable: enable stuck queue check, default = 0

drivers/net/wireless/iwlwifi/iwl-phy-db.c

+0 −16
Original line number Diff line number Diff line
@@ -136,12 +136,6 @@ struct iwl_calib_res_notif_phy_db { 
	u8 data[];

} __packed;



#define IWL_PHY_DB_STATIC_PIC cpu_to_le32(0x21436587)

static inline void iwl_phy_db_test_pic(__le32 pic)

{

	WARN_ON(IWL_PHY_DB_STATIC_PIC != pic);

}



struct iwl_phy_db *iwl_phy_db_init(struct iwl_trans *trans)

{

	struct iwl_phy_db *phy_db = kzalloc(sizeof(struct iwl_phy_db),
@@ -260,11 +254,6 @@ int iwl_phy_db_set_section(struct iwl_phy_db *phy_db, struct iwl_rx_packet *pkt, 
			(size - CHANNEL_NUM_SIZE) / phy_db->channel_num;

	}



	/* Test PIC */

	if (type != IWL_PHY_DB_CFG)

		iwl_phy_db_test_pic(*(((__le32 *)phy_db_notif->data) +

				      (size / sizeof(__le32)) - 1));



	IWL_DEBUG_INFO(phy_db->trans,

		       "%s(%d): [PHYDB]SET: Type %d , Size: %d\n",

		       __func__, __LINE__, type, size);
@@ -372,11 +361,6 @@ int iwl_phy_db_get_section_data(struct iwl_phy_db *phy_db, 
		*size = entry->size;

	}



	/* Test PIC */

	if (type != IWL_PHY_DB_CFG)

		iwl_phy_db_test_pic(*(((__le32 *)*data) +

				      (*size / sizeof(__le32)) - 1));



	IWL_DEBUG_INFO(phy_db->trans,

		       "%s(%d): [PHYDB] GET: Type %d , Size: %d\n",

		       __func__, __LINE__, type, *size);