linux-kernel - linux-next: manual merge of the wireless tree with the wireless-current tree

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [thread-next>] [day] [month] [year] [list]

Message-Id: <20100401125944.54adc73c.sfr@canb.auug.org.au>
Date:	Thu, 1 Apr 2010 12:59:44 +1100
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	"John W. Linville" <linville@...driver.com>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	"Wey-Yi Guy" <wey-yi.w.guy@...el.com>,
	Reinette Chatre <reinette.chatre@...el.com>
Subject: linux-next: manual merge of the wireless tree with the
 wireless-current tree

Hi John,

Today's linux-next merge of the wireless tree got a conflict in
drivers/net/wireless/iwlwifi/iwl-4965.c between commit
be6b38bcb175613f239e0b302607db346472c6b6 ("iwlwifi: counting number of
tfds can be free for 4965") from the wireless-current tree and commit
74bcdb33e99f49ef5202dd2f8109945b4570edc2 ("iwlwifi: move agn only tx
functions from iwlcore to iwlagn") from the wireless tree.

I fixed it up (see below) and can carry the fix for a while.
-- 
Cheers,
Stephen Rothwell                    sfr@...b.auug.org.au

diff --cc drivers/net/wireless/iwlwifi/iwl-4965.c
index 3297fc7,1808c97..0000000
--- a/drivers/net/wireless/iwlwifi/iwl-4965.c
+++ b/drivers/net/wireless/iwlwifi/iwl-4965.c
@@@ -2046,15 -2047,17 +2047,15 @@@ static void iwl4965_rx_reply_tx(struct 
  				   le32_to_cpu(tx_resp->rate_n_flags),
  				   tx_resp->failure_frame);
  
- 		freed = iwl_tx_queue_reclaim(priv, txq_id, index);
+ 		freed = iwlagn_tx_queue_reclaim(priv, txq_id, index);
 -		if (qc && likely(sta_id != IWL_INVALID_STATION))
 -			priv->stations[sta_id].tid[tid].tfds_in_queue -= freed;
 +		iwl_free_tfds_in_queue(priv, sta_id, tid, freed);
  
  		if (priv->mac80211_registered &&
  		    (iwl_queue_space(&txq->q) > txq->q.low_mark))
  			iwl_wake_queue(priv, txq_id);
  	}
  
- 	iwl_txq_check_empty(priv, sta_id, tid, txq_id);
 -	if (qc && likely(sta_id != IWL_INVALID_STATION))
 -		iwlagn_txq_check_empty(priv, sta_id, tid, txq_id);
++	iwlagn_txq_check_empty(priv, sta_id, tid, txq_id);
  
  	if (iwl_check_bits(status, TX_ABORT_REQUIRED_MSK))
  		IWL_ERR(priv, "TODO:  Implement Tx ABORT REQUIRED!!!\n");

Content of type "application/pgp-signature" skipped