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

Commit 8a50ace2 authored by John W. Linville's avatar John W. Linville
Browse files

Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-next

parents d07d1528 3ec45882

drivers/net/wireless/iwlwifi/dvm/commands.h

+1 −0
Original line number Diff line number Diff line
@@ -1905,6 +1905,7 @@ struct iwl_bt_cmd { 
#define IWLAGN_BT_PRIO_BOOST_MAX	0xFF

#define IWLAGN_BT_PRIO_BOOST_MIN	0x00

#define IWLAGN_BT_PRIO_BOOST_DEFAULT	0xF0

#define IWLAGN_BT_PRIO_BOOST_DEFAULT32	0xF0F0F0F0



#define IWLAGN_BT_MAX_KILL_DEFAULT	5

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

+2 −0
Original line number Diff line number Diff line
@@ -265,6 +265,8 @@ void iwlagn_send_advance_bt_config(struct iwl_priv *priv) 
			bt_cmd_v2.tx_prio_boost = 0;

			bt_cmd_v2.rx_prio_boost = 0;

		} else {

			/* older version only has 8 bits */

			WARN_ON(priv->cfg->bt_params->bt_prio_boost & ~0xFF);

			bt_cmd_v1.prio_boost =

				priv->cfg->bt_params->bt_prio_boost;

			bt_cmd_v1.tx_prio_boost = 0;

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

+0 −1
Original line number Diff line number Diff line
@@ -1232,7 +1232,6 @@ static struct iwl_op_mode *iwl_op_mode_dvm_start(struct iwl_trans *trans, 
	struct iwl_trans_config trans_cfg;

	static const u8 no_reclaim_cmds[] = {

		REPLY_RX_PHY_CMD,

		REPLY_RX,

		REPLY_RX_MPDU_CMD,

		REPLY_COMPRESSED_BA,

		STATISTICS_NOTIFICATION,

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

+11 −33
Original line number Diff line number Diff line
@@ -88,7 +88,6 @@ const char *iwl_dvm_cmd_strings[REPLY_MAX] = { 
	IWL_CMD_ENTRY(REPLY_PHY_CALIBRATION_CMD),

	IWL_CMD_ENTRY(REPLY_RX_PHY_CMD),

	IWL_CMD_ENTRY(REPLY_RX_MPDU_CMD),

	IWL_CMD_ENTRY(REPLY_RX),

	IWL_CMD_ENTRY(REPLY_COMPRESSED_BA),

	IWL_CMD_ENTRY(CALIBRATION_CFG_CMD),

	IWL_CMD_ENTRY(CALIBRATION_RES_NOTIFICATION),
@@ -895,8 +894,7 @@ static int iwlagn_calc_rssi(struct iwl_priv *priv, 
	return max_rssi - agc - IWLAGN_RSSI_OFFSET;

}



/* Called for REPLY_RX (legacy ABG frames), or

 * REPLY_RX_MPDU_CMD (HT high-throughput N frames). */

/* Called for REPLY_RX_MPDU_CMD */

static int iwlagn_rx_reply_rx(struct iwl_priv *priv,

			    struct iwl_rx_cmd_buffer *rxb,

			    struct iwl_device_cmd *cmd)
@@ -911,25 +909,6 @@ static int iwlagn_rx_reply_rx(struct iwl_priv *priv, 
	u32 ampdu_status;

	u32 rate_n_flags;



	/**

	 * REPLY_RX and REPLY_RX_MPDU_CMD are handled differently.

	 *	REPLY_RX: physical layer info is in this buffer

	 *	REPLY_RX_MPDU_CMD: physical layer info was sent in separate

	 *		command and cached in priv->last_phy_res

	 *

	 * Here we set up local variables depending on which command is

	 * received.

	 */

	if (pkt->hdr.cmd == REPLY_RX) {

		phy_res = (struct iwl_rx_phy_res *)pkt->data;

		header = (struct ieee80211_hdr *)(pkt->data + sizeof(*phy_res)

				+ phy_res->cfg_phy_cnt);



		len = le16_to_cpu(phy_res->byte_count);

		rx_pkt_status = *(__le32 *)(pkt->data + sizeof(*phy_res) +

				phy_res->cfg_phy_cnt + len);

		ampdu_status = le32_to_cpu(rx_pkt_status);

	} else {

	if (!priv->last_phy_res_valid) {

		IWL_ERR(priv, "MPDU frame without cached PHY data\n");

		return 0;
@@ -941,7 +920,6 @@ static int iwlagn_rx_reply_rx(struct iwl_priv *priv, 
	rx_pkt_status = *(__le32 *)(pkt->data + sizeof(*amsdu) + len);

	ampdu_status = iwlagn_translate_rx_status(priv,

						  le32_to_cpu(rx_pkt_status));

	}



	if ((unlikely(phy_res->cfg_phy_cnt > 20))) {

		IWL_DEBUG_DROP(priv, "dsp size out of range [0,20]: %d\n",

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

+1 −1
Original line number Diff line number Diff line
@@ -177,7 +177,7 @@ struct iwl_base_params { 
struct iwl_bt_params {

	bool advanced_bt_coexist;

	u8 bt_init_traffic_load;

	u8 bt_prio_boost;

	u32 bt_prio_boost;

	u16 agg_time_limit;

	bool bt_sco_disable;

	bool bt_session_2;