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

Commit f30a9443 authored by John W. Linville's avatar John W. Linville Committed by David S. Miller
Browse files

Merge branch 'master' of... 

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless

 into for-davem

John W. Linville says:

====================
This is a batch of fixes intended for 3.7...

Included are two pulls.  Regarding the mac80211 tree, Johannes says:

"Please pull my mac80211.git tree (see below) to get two more fixes for
3.7. Both fix regressions introduced *before* this cycle that weren't
noticed until now, one for IBSS not cleaning up properly and the other
to add back the "wireless" sysfs directory for Fedora's startup scripts."

Regarding the iwlwifi tree, Johannes says:

"Please also pull my iwlwifi.git tree, I have two fixes: one to remove a
spurious warning that can actually trigger in legitimate situations, and
the other to fix a regression from when monitor mode was changed to use
the "sniffer" firmware mode."

Also included is an nfc tree pull.  Samuel says:

"We mostly have pn533 fixes here, 2 memory leaks and an early unlocking fix.
Moreover, we also have an LLCP adapter linked list insertion fix."

On top of that, a few more bits...  Albert Pool adds a USB ID
to rtlwifi.  Bing Zhao provides two mwifiex fixes -- one to fix
a system hang during a command timeout, and the other to properly
report a suspend error to the MMC core.  Finally, Sujith Manoharan
fixes a thinko that would trigger an ath9k hang during device reset.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents aecb55be 400e0208

drivers/net/wireless/ath/ath9k/hw.c

+1 −1
Original line number Diff line number Diff line
@@ -1456,7 +1456,7 @@ static bool ath9k_hw_set_reset_reg(struct ath_hw *ah, u32 type) 
	switch (type) {

	case ATH9K_RESET_POWER_ON:

		ret = ath9k_hw_set_reset_power_on(ah);

		if (!ret)

		if (ret)

			ah->reset_power_on = true;

		break;

	case ATH9K_RESET_WARM:

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

+14 −0
Original line number Diff line number Diff line
@@ -1354,6 +1354,20 @@ static int iwlagn_mac_add_interface(struct ieee80211_hw *hw, 
	vif_priv->ctx = ctx;

	ctx->vif = vif;



	/*

	 * In SNIFFER device type, the firmware reports the FCS to

	 * the host, rather than snipping it off. Unfortunately,

	 * mac80211 doesn't (yet) provide a per-packet flag for

	 * this, so that we have to set the hardware flag based

	 * on the interfaces added. As the monitor interface can

	 * only be present by itself, and will be removed before

	 * other interfaces are added, this is safe.

	 */

	if (vif->type == NL80211_IFTYPE_MONITOR)

		priv->hw->flags |= IEEE80211_HW_RX_INCLUDES_FCS;

	else

		priv->hw->flags &= ~IEEE80211_HW_RX_INCLUDES_FCS;



	err = iwl_setup_interface(priv, ctx);

	if (!err || reset)

		goto out;

drivers/net/wireless/iwlwifi/pcie/tx.c

+0 −8
Original line number Diff line number Diff line
@@ -480,20 +480,12 @@ void iwl_trans_pcie_txq_enable(struct iwl_trans *trans, int txq_id, int fifo, 
void iwl_trans_pcie_txq_disable(struct iwl_trans *trans, int txq_id)

{

	struct iwl_trans_pcie *trans_pcie = IWL_TRANS_GET_PCIE_TRANS(trans);

	u16 rd_ptr, wr_ptr;

	int n_bd = trans_pcie->txq[txq_id].q.n_bd;



	if (!test_and_clear_bit(txq_id, trans_pcie->queue_used)) {

		WARN_ONCE(1, "queue %d not used", txq_id);

		return;

	}



	rd_ptr = iwl_read_prph(trans, SCD_QUEUE_RDPTR(txq_id)) & (n_bd - 1);

	wr_ptr = iwl_read_prph(trans, SCD_QUEUE_WRPTR(txq_id));



	WARN_ONCE(rd_ptr != wr_ptr, "queue %d isn't empty: [%d,%d]",

		  txq_id, rd_ptr, wr_ptr);



	iwl_txq_set_inactive(trans, txq_id);

	IWL_DEBUG_TX_QUEUES(trans, "Deactivate queue %d\n", txq_id);

}

drivers/net/wireless/mwifiex/cmdevt.c

+8 −3
Original line number Diff line number Diff line
@@ -890,9 +890,6 @@ mwifiex_cmd_timeout_func(unsigned long function_context) 
		return;

	}

	cmd_node = adapter->curr_cmd;

	if (cmd_node->wait_q_enabled)

		adapter->cmd_wait_q.status = -ETIMEDOUT;



	if (cmd_node) {

		adapter->dbg.timeout_cmd_id =

			adapter->dbg.last_cmd_id[adapter->dbg.last_cmd_index];
@@ -938,6 +935,14 @@ mwifiex_cmd_timeout_func(unsigned long function_context) 


		dev_err(adapter->dev, "ps_mode=%d ps_state=%d\n",

			adapter->ps_mode, adapter->ps_state);



		if (cmd_node->wait_q_enabled) {

			adapter->cmd_wait_q.status = -ETIMEDOUT;

			wake_up_interruptible(&adapter->cmd_wait_q.wait);

			mwifiex_cancel_pending_ioctl(adapter);

			/* reset cmd_sent flag to unblock new commands */

			adapter->cmd_sent = false;

		}

	}

	if (adapter->hw_status == MWIFIEX_HW_STATUS_INITIALIZING)

		mwifiex_init_fw_complete(adapter);

drivers/net/wireless/mwifiex/sdio.c

+6 −5
Original line number Diff line number Diff line
@@ -161,7 +161,6 @@ static int mwifiex_sdio_suspend(struct device *dev) 
	struct sdio_mmc_card *card;

	struct mwifiex_adapter *adapter;

	mmc_pm_flag_t pm_flag = 0;

	int hs_actived = 0;

	int i;

	int ret = 0;
@@ -188,12 +187,14 @@ static int mwifiex_sdio_suspend(struct device *dev) 
	adapter = card->adapter;



	/* Enable the Host Sleep */

	hs_actived = mwifiex_enable_hs(adapter);

	if (hs_actived) {

		pr_debug("cmd: suspend with MMC_PM_KEEP_POWER\n");

		ret = sdio_set_host_pm_flags(func, MMC_PM_KEEP_POWER);

	if (!mwifiex_enable_hs(adapter)) {

		dev_err(adapter->dev, "cmd: failed to suspend\n");

		return -EFAULT;

	}



	dev_dbg(adapter->dev, "cmd: suspend with MMC_PM_KEEP_POWER\n");

	ret = sdio_set_host_pm_flags(func, MMC_PM_KEEP_POWER);



	/* Indicate device suspended */

	adapter->is_suspended = true;