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,
Felix Fietkau <nbd@openwrt.org>
Subject: linux-next: manual merge of the wireless-next tree with the net tree
Date: Wed, 23 Jan 2013 12:12:38 +1100 [thread overview]
Message-ID: <20130123121238.bc4ba1fe89c20d41fb5752ae@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 2094 bytes --]
Hi John,
Today's linux-next merge of the wireless-next tree got a conflict in
drivers/net/wireless/ath/ath9k/main.c between commit 4b883f021b9c
("ath9k: fix rx flush handling") from the net tree and commit
1381559ba48a ("ath9k: clean up processing of pending tx frames on reset")
from the wireless-next tree.
I fixed it up (see below) and can carry the fix as necessary (no action
is required).
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
diff --cc drivers/net/wireless/ath/ath9k/main.c
index dd91f8f,3e5082c..0000000
--- a/drivers/net/wireless/ath/ath9k/main.c
+++ b/drivers/net/wireless/ath/ath9k/main.c
@@@ -182,7 -182,7 +182,7 @@@ static void ath_restart_work(struct ath
ath_start_ani(sc);
}
- static bool ath_prepare_reset(struct ath_softc *sc, bool retry_tx)
-static bool ath_prepare_reset(struct ath_softc *sc, bool flush)
++static bool ath_prepare_reset(struct ath_softc *sc)
{
struct ath_hw *ah = sc->sc_ah;
bool ret = true;
@@@ -196,12 -196,20 +196,12 @@@
ath9k_debug_samp_bb_mac(sc);
ath9k_hw_disable_interrupts(ah);
- if (!ath_stoprecv(sc))
+ if (!ath_drain_all_txq(sc))
ret = false;
- if (!ath_drain_all_txq(sc, retry_tx))
+ if (!ath_stoprecv(sc))
ret = false;
- if (!flush) {
- if (ah->caps.hw_caps & ATH9K_HW_CAP_EDMA)
- ath_rx_tasklet(sc, 1, true);
- ath_rx_tasklet(sc, 1, false);
- } else {
- ath_flushrecv(sc);
- }
-
return ret;
}
@@@ -271,7 -278,8 +270,7 @@@ static int ath_reset_internal(struct at
hchan = ah->curchan;
}
- if (!ath_prepare_reset(sc, retry_tx))
- if (!ath_prepare_reset(sc, flush))
++ if (!ath_prepare_reset(sc))
fastcc = false;
ath_dbg(common, CONFIG, "Reset to %u MHz, HT40: %d fastcc: %d\n",
@@@ -797,7 -801,7 +794,7 @@@ static void ath9k_stop(struct ieee80211
ath9k_hw_cfg_gpio_input(ah, ah->led_pin);
}
- ath_prepare_reset(sc, false);
- ath_prepare_reset(sc, true);
++ ath_prepare_reset(sc);
if (sc->rx.frag) {
dev_kfree_skb_any(sc->rx.frag);
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
next reply other threads:[~2013-01-23 1:12 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-01-23 1:12 Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2022-02-17 0:09 linux-next: manual merge of the wireless-next tree with the net tree Stephen Rothwell
2013-06-20 3:40 Stephen Rothwell
2013-06-04 2:43 Stephen Rothwell
2012-06-12 1:41 Stephen Rothwell
2012-06-15 0:23 ` Stephen Rothwell
2012-06-12 1:31 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=20130123121238.bc4ba1fe89c20d41fb5752ae@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=nbd@openwrt.org \
/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;
as well as URLs for NNTP newsgroup(s).