From: Stephen Rothwell <sfr@canb.auug.org.au>
To: "John W. Linville" <linville@tuxdriver.com>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
"Wey-Yi Guy" <wey-yi.w.guy@intel.com>
Subject: linux-next: manual merge of the wireless tree with the wireless-current tree
Date: Fri, 9 Apr 2010 11:05:20 +1000 [thread overview]
Message-ID: <20100409110520.9d4be988.sfr@canb.auug.org.au> (raw)
Hi John,
Today's linux-next merge of the wireless tree got a conflict in
drivers/net/wireless/iwlwifi/iwl-4965.c between commit
ece6444c2fe80dab679beb5f0d58b091f1933b00 ("iwlwifi: need check for valid
qos packet before free") from the wireless-current tree and commit
74bcdb33e99f49ef5202dd2f8109945b4570edc2 ("iwlwifi: move agn only tx
functions from iwlcore to iwlagn") from the wireless tree.
Just context changes. I fixed it up (see below) and can carry the fix
for a while.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
diff --cc drivers/net/wireless/iwlwifi/iwl-4965.c
index 89aba76,6edae9b..0000000
--- a/drivers/net/wireless/iwlwifi/iwl-4965.c
+++ b/drivers/net/wireless/iwlwifi/iwl-4965.c
@@@ -2020,10 -2013,8 +2013,10 @@@ static void iwl4965_rx_reply_tx(struct
index = iwl_queue_dec_wrap(scd_ssn & 0xff, txq->q.n_bd);
IWL_DEBUG_TX_REPLY(priv, "Retry scheduler reclaim scd_ssn "
"%d index %d\n", scd_ssn , index);
- freed = iwl_tx_queue_reclaim(priv, txq_id, index);
+ freed = iwlagn_tx_queue_reclaim(priv, txq_id, index);
- iwl_free_tfds_in_queue(priv, sta_id, tid, freed);
+ if (qc)
+ iwl_free_tfds_in_queue(priv, sta_id,
+ tid, freed);
if (priv->mac80211_registered &&
(iwl_queue_space(&txq->q) > txq->q.low_mark) &&
@@@ -2048,18 -2039,15 +2041,18 @@@
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);
- iwl_free_tfds_in_queue(priv, sta_id, tid, freed);
+ if (qc && likely(sta_id != IWL_INVALID_STATION))
+ iwl_free_tfds_in_queue(priv, sta_id, tid, freed);
+ else if (sta_id == IWL_INVALID_STATION)
+ IWL_DEBUG_TX_REPLY(priv, "Station not known\n");
if (priv->mac80211_registered &&
(iwl_queue_space(&txq->q) > txq->q.low_mark))
iwl_wake_queue(priv, txq_id);
}
-
- iwlagn_txq_check_empty(priv, sta_id, tid, txq_id);
+ if (qc && likely(sta_id != IWL_INVALID_STATION))
- iwl_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");
next reply other threads:[~2010-04-09 1:05 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-04-09 1:05 Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2011-09-28 3:19 Stephen Rothwell
2011-09-28 9:10 ` Jouni Malinen
2011-09-14 3:05 Stephen Rothwell
2011-06-21 1:49 Stephen Rothwell
2011-06-21 18:05 ` Gustavo F. Padovan
2011-04-05 2:21 Stephen Rothwell
2011-04-05 2:21 Stephen Rothwell
2010-12-14 2:22 Stephen Rothwell
2010-08-30 1:58 Stephen Rothwell
2010-04-07 2:58 Stephen Rothwell
2010-04-07 14:44 ` John W. Linville
2010-04-07 15:31 ` Stephen Rothwell
2010-04-07 23:19 ` David Miller
2010-04-01 1:59 Stephen Rothwell
2010-04-01 11:43 ` John W. Linville
2010-03-11 2:15 Stephen Rothwell
2010-03-11 2:38 ` Bruno Randolf
2010-03-11 3:04 ` Stephen Rothwell
2010-02-23 1:26 Stephen Rothwell
2009-11-24 3:11 Stephen Rothwell
2009-11-24 15:05 ` John W. Linville
2009-07-09 1:40 Stephen Rothwell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20100409110520.9d4be988.sfr@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=linville@tuxdriver.com \
--cc=wey-yi.w.guy@intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®