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

Commit 1ed3aad1 authored by David S. Miller's avatar David S. Miller
Browse files

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

parents f01cb5fb 069f40fc

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

+1 −1
Original line number Diff line number Diff line
@@ -506,7 +506,7 @@ bool ath_stoprecv(struct ath_softc *sc) 
			"confusing the DMA engine when we start RX up\n");

		ATH_DBG_WARN_ON_ONCE(!stopped);

	}

	return stopped || reset;

	return stopped && !reset;

}



void ath_flushrecv(struct ath_softc *sc)

drivers/net/wireless/iwlegacy/iwl-4965-tx.c

+7 −3
Original line number Diff line number Diff line
@@ -1127,12 +1127,16 @@ int iwl4965_tx_queue_reclaim(struct iwl_priv *priv, int txq_id, int index) 
	     q->read_ptr = iwl_legacy_queue_inc_wrap(q->read_ptr, q->n_bd)) {



		tx_info = &txq->txb[txq->q.read_ptr];

		iwl4965_tx_status(priv, tx_info,

				 txq_id >= IWL4965_FIRST_AMPDU_QUEUE);



		if (WARN_ON_ONCE(tx_info->skb == NULL))

			continue;



		hdr = (struct ieee80211_hdr *)tx_info->skb->data;

		if (hdr && ieee80211_is_data_qos(hdr->frame_control))

		if (ieee80211_is_data_qos(hdr->frame_control))

			nfreed++;



		iwl4965_tx_status(priv, tx_info,

				 txq_id >= IWL4965_FIRST_AMPDU_QUEUE);

		tx_info->skb = NULL;



		priv->cfg->ops->lib->txq_free_tfd(priv, txq);

drivers/net/wireless/iwlwifi/iwl-agn-rxon.c

+1 −6
Original line number Diff line number Diff line
@@ -335,7 +335,6 @@ int iwlagn_mac_config(struct ieee80211_hw *hw, u32 changed) 
	struct ieee80211_channel *channel = conf->channel;

	const struct iwl_channel_info *ch_info;

	int ret = 0;

	bool ht_changed[NUM_IWL_RXON_CTX] = {};



	IWL_DEBUG_MAC80211(priv, "changed %#x", changed);
@@ -383,10 +382,8 @@ int iwlagn_mac_config(struct ieee80211_hw *hw, u32 changed) 


		for_each_context(priv, ctx) {

			/* Configure HT40 channels */

			if (ctx->ht.enabled != conf_is_ht(conf)) {

			if (ctx->ht.enabled != conf_is_ht(conf))

				ctx->ht.enabled = conf_is_ht(conf);

				ht_changed[ctx->ctxid] = true;

			}



			if (ctx->ht.enabled) {

				if (conf_is_ht40_minus(conf)) {
@@ -455,8 +452,6 @@ int iwlagn_mac_config(struct ieee80211_hw *hw, u32 changed) 
		if (!memcmp(&ctx->staging, &ctx->active, sizeof(ctx->staging)))

			continue;

		iwlagn_commit_rxon(priv, ctx);

		if (ht_changed[ctx->ctxid])

			iwlagn_update_qos(priv, ctx);

	}

 out:

	mutex_unlock(&priv->mutex);

drivers/net/wireless/iwlwifi/iwl-agn-tx.c

+7 −3
Original line number Diff line number Diff line
@@ -1224,12 +1224,16 @@ int iwlagn_tx_queue_reclaim(struct iwl_priv *priv, int txq_id, int index) 
	     q->read_ptr = iwl_queue_inc_wrap(q->read_ptr, q->n_bd)) {



		tx_info = &txq->txb[txq->q.read_ptr];

		iwlagn_tx_status(priv, tx_info,

				 txq_id >= IWLAGN_FIRST_AMPDU_QUEUE);



		if (WARN_ON_ONCE(tx_info->skb == NULL))

			continue;



		hdr = (struct ieee80211_hdr *)tx_info->skb->data;

		if (hdr && ieee80211_is_data_qos(hdr->frame_control))

		if (ieee80211_is_data_qos(hdr->frame_control))

			nfreed++;



		iwlagn_tx_status(priv, tx_info,

				 txq_id >= IWLAGN_FIRST_AMPDU_QUEUE);

		tx_info->skb = NULL;



		if (priv->cfg->ops->lib->txq_inval_byte_cnt_tbl)

net/bluetooth/hci_core.c

+2 −3
Original line number Diff line number Diff line
@@ -587,10 +587,8 @@ static int hci_dev_do_close(struct hci_dev *hdev) 
	hci_req_cancel(hdev, ENODEV);

	hci_req_lock(hdev);



	/* Stop timer, it might be running */

	del_timer_sync(&hdev->cmd_timer);



	if (!test_and_clear_bit(HCI_UP, &hdev->flags)) {

		del_timer_sync(&hdev->cmd_timer);

		hci_req_unlock(hdev);

		return 0;

	}
@@ -629,6 +627,7 @@ static int hci_dev_do_close(struct hci_dev *hdev) 


	/* Drop last sent command */

	if (hdev->sent_cmd) {

		del_timer_sync(&hdev->cmd_timer);

		kfree_skb(hdev->sent_cmd);

		hdev->sent_cmd = NULL;

	}