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 for Android: free password hash cracker in your pocket

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

Message-Id: <20100223122649.34f7d0bb.sfr@canb.auug.org.au>
Date:	Tue, 23 Feb 2010 12:26:49 +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,
	Abhijeet Kolekar <abhijeet.kolekar@...el.com>,
	Reinette Chatre <reinette.chatre@...el.com>,
	"Wey-Yi Guy" <wey-yi.w.guy@...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-core.h between commit
a239a8b47cc0e5e6d7416a89f340beac06d5edaa ("iwlwifi: error checking for
number of tfds in queue") from the wireless-current tree and commit
7bfedc59ee350727b115bbc79780c69b114f162d ("iwlwifi: cleanup return
values") from the wireless tree.

Just context changes.  I fixed it up (see below) and can carry the fix as
necessary.
-- 
Cheers,
Stephen Rothwell                    sfr@...b.auug.org.au

diff --cc drivers/net/wireless/iwlwifi/iwl-core.h
index 1b0701b,3df7933..0000000
--- a/drivers/net/wireless/iwlwifi/iwl-core.h
+++ b/drivers/net/wireless/iwlwifi/iwl-core.h
@@@ -450,9 -451,7 +451,9 @@@ int iwl_tx_skb(struct iwl_priv *priv, s
  void iwl_hw_txq_ctx_free(struct iwl_priv *priv);
  int iwl_hw_tx_queue_init(struct iwl_priv *priv,
  			 struct iwl_tx_queue *txq);
- int iwl_txq_update_write_ptr(struct iwl_priv *priv, struct iwl_tx_queue *txq);
+ void iwl_txq_update_write_ptr(struct iwl_priv *priv, struct iwl_tx_queue *txq);
 +void iwl_free_tfds_in_queue(struct iwl_priv *priv,
 +			    int sta_id, int tid, int freed);
  int iwl_tx_queue_init(struct iwl_priv *priv, struct iwl_tx_queue *txq,
  		      int slots_num, u32 txq_id);
  void iwl_tx_queue_free(struct iwl_priv *priv, int txq_id);
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/