The patch titled
Net: ath5k, no printk after STA->IBSS switch
has been removed from the -mm tree. Its filename was
net-ath5k-no-printk-after-sta-ibss-switch.patch
This patch was dropped because it was merged into mainline or a subsystem tree
------------------------------------------------------
Subject: Net: ath5k, no printk after STA->IBSS switch
From: Jiri Slaby <jirislaby@xxxxxxxxx>
If STA->IBSS switch was done, but beacon_update weas not called so far, do not
emit a warning about non-existent skbuf.
Signed-off-by: Jiri Slaby <jirislaby@xxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
drivers/net/wireless/ath5k_base.c | 4 +++-
1 files changed, 3 insertions(+), 1 deletion(-)
diff -puN drivers/net/wireless/ath5k_base.c~net-ath5k-no-printk-after-sta-ibss-switch drivers/net/wireless/ath5k_base.c
--- a/drivers/net/wireless/ath5k_base.c~net-ath5k-no-printk-after-sta-ibss-switch
+++ a/drivers/net/wireless/ath5k_base.c
@@ -655,7 +655,9 @@ static void ath_beacon_config(struct ath
DPRINTF(sc, ATH_DEBUG_BEACON, "%s: intval %u hw tsftu %u\n", __func__,
intval, tsftu);
- if (sc->opmode == IEEE80211_IF_TYPE_STA) {
+ if (sc->opmode == IEEE80211_IF_TYPE_STA ||
+ (sc->opmode == IEEE80211_IF_TYPE_IBSS &&
+ !sc->bbuf->skb)) {
ath5k_hw_set_intr(ah, 0);
sc->imask |= AR5K_INT_BMISS;
sc->bmisscount = 0;
_
Patches currently in -mm which might be from jirislaby@xxxxxxxxx are
git-wireless.patch
net-add-ath5k-wireless-driver-fix.patch
epcac-reformat-comments-and-coding-style-improvements.patch
char-mxser_new-upgrade-to-110.patch
char-mxser_new-move-to-pci_vdevice.patch
char-mxser_new-remove-useless-comments-in-mxser_cards.patch
mxser-remove-commented-crap.patch
char-moxa-fix-and-optimise-empty-timer.patch
char-cyclades-remove-bottom-half-processing.patch
char-cyclades-make-the-isr-code-readable.patch
char-cyclades-move-spin_lock-to-one-place.patch
char-cyclades-fix-some-w-warnings.patch
char-moxa-cleanup-prints.patch
char-moxa-function-names-cleanup.patch
char-moxa-remove-sleep_on.patch
fs-select-remove-unused-macros.patch
cyber2000fb-rename-bit-macro.patch
i2c-pxa-rename-bit-macro-to-pxa_bit.patch
s2io-rename-bit-macro.patch
amba-pl011-rename-bit-macro.patch
define-first-set-of-bit-macros.patch
get-rid-of-input-bit-duplicate-defines.patch
define-global-bit-macro.patch
flashpoint-use-bit-instead-of-bitw.patch
shrink_slab-handle-bad-shrinkers.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
