Bob Copeland wrote:
On Wed, May 26, 2010 at 11:49 PM, Richard Farina <sidhayn@xxxxxxxxx> wrote:
Bob Copeland wrote:
Ok, it should be enough to look at the filter flags instead of
the opmode -- I knew in the back of my mind that the monitor
stuff was bogus (part of the reason I did the patch in the first
place) but just got confused by what was already there I guess.
I've got a lot of people very interested in this fix. Let me know what kind
of support you need to make this happen. You know where to find me on irc
;-)
Ok, can you and Weedy try this patch?
Use the attachment -- gmail will screw up the whitespace, but I included
it inline for reference.
Weedy, if you want reported-by credit can you give your full name and
preferred email address?
From: Bob Copeland <me@xxxxxxxxxxxxxxx>
Date: Thu, 27 May 2010 08:54:38 -0400
Subject: [PATCH] ath5k: retain promiscuous setting
Commit 56d1de0a21db28e41741cfa0a66e18bc8d920554, "ath5k: clean up
filter flags setting" introduced a regression in monitor mode such
that the promisc filter flag would get lost.
Although we set the promisc flag when it changed, we did not
preserve it across subsequent calls to configure_filter. This patch
restores the original functionality.
Cc: stable@xxxxxxxxxx
Signed-off-by: Bob Copeland <me@xxxxxxxxxxxxxxx>
---
Note, a better fix would be to just unconditionally look at new_flags,
but this is the minimal change for stable. I'll add fixing all this
stuff up to my todo.
drivers/net/wireless/ath/ath5k/base.c | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/drivers/net/wireless/ath/ath5k/base.c
b/drivers/net/wireless/ath/ath5k/base.c
index 9c27623..9e023b8 100644
--- a/drivers/net/wireless/ath/ath5k/base.c
+++ b/drivers/net/wireless/ath/ath5k/base.c
@@ -3153,13 +3153,15 @@ static void ath5k_configure_filter(struct
ieee80211_hw *hw,
if (changed_flags & (FIF_PROMISC_IN_BSS | FIF_OTHER_BSS)) {
if (*new_flags & FIF_PROMISC_IN_BSS) {
- rfilt |= AR5K_RX_FILTER_PROM;
__set_bit(ATH_STAT_PROMISC, sc->status);
} else {
__clear_bit(ATH_STAT_PROMISC, sc->status);
}
}
+ if (test_bit(ATH_STAT_PROMISC, sc->status))
+ rfilt |= AR5K_RX_FILTER_PROM;
+
/* Note, AR5K_RX_FILTER_MCAST is already enabled */
if (*new_flags & FIF_ALLMULTI) {
mfilt[0] = ~0;
Tested-By: Rick Farina
This patch fixes the problem, data packets are now captured while in
monitor mode. Incidentally when I tried to chase this back to see when
it started I found the same behavior in 2.6.32_rc and even in 2.6.29
(which is funny since Weedy bisected the change to some time during
2.6.31_rc5). This fix should be pushed out to as much of stable as
possible as soon as possible. Thanks for the patch Bob!
-Rick Farina
--
To unsubscribe from this list: send the line "unsubscribe linux-wireless" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
