[PATCH] zd1211rw: Fix beacon filter flags thinko

[PATCH] zd1211rw: Fix beacon filter flags thinko

[Michael Buesch]

We must not clear the FIF_BCN_PRBRESP_PROMISC bit in the
new_flags. The zd-driver does support sending beacons and
probe responses to the host. What the flag does is say "Send me
all beacons and probe responses". And we actually do that. We always
do that, so we ignore the case when the bit is disabled. But that is
fine. But we must not clear the flag, as that tells mac80211 that
we do not support passing beacons and probe responses to the stack.
And that's not true.

Signed-off-by: Michael Buesch <mb@bu3sch.de>

---

Should probably go -stable, too.


Index: wireless-2.6/drivers/net/wireless/zd1211rw/zd_mac.c
===================================================================
--- wireless-2.6.orig/drivers/net/wireless/zd1211rw/zd_mac.c	2008-02-10 15:56:18.000000000 +0100
+++ wireless-2.6/drivers/net/wireless/zd1211rw/zd_mac.c	2008-02-10 15:57:51.000000000 +0100
@@ -765,13 +765,13 @@ static void set_rx_filter_handler(struct
 	if (r)
 		dev_err(zd_mac_dev(mac), "set_rx_filter_handler error %d\n", r);
 }
 
 #define SUPPORTED_FIF_FLAGS \
 	(FIF_PROMISC_IN_BSS | FIF_ALLMULTI | FIF_FCSFAIL | FIF_CONTROL | \
-	FIF_OTHER_BSS)
+	FIF_OTHER_BSS | FIF_BCN_PRBRESP_PROMISC)
 static void zd_op_configure_filter(struct ieee80211_hw *hw,
 			unsigned int changed_flags,
 			unsigned int *new_flags,
 			int mc_count, struct dev_mc_list *mclist)
 {
 	struct zd_mc_hash hash;

Re: [PATCH] zd1211rw: Fix beacon filter flags thinko

[Johannes Berg]

[-- Attachment #1: Type: text/plain, Size: 907 bytes --]


On Sun, 2008-02-10 at 16:03 +0100, Michael Buesch wrote:
> We must not clear the FIF_BCN_PRBRESP_PROMISC bit in the
> new_flags. The zd-driver does support sending beacons and
> probe responses to the host. What the flag does is say "Send me
> all beacons and probe responses". And we actually do that. We always
> do that, so we ignore the case when the bit is disabled. But that is
> fine. But we must not clear the flag, as that tells mac80211 that
> we do not support passing beacons and probe responses to the stack.
> And that's not true.

Good explanation. Maybe it's needed with the filter flags defines/the
config_filter callback description?

> Signed-off-by: Michael Buesch <mb@bu3sch.de>

Acked-by: Johannes Berg <johannes@sipsolutions.net>

> ---
> 
> Should probably go -stable, too.

Unnecessary, I don't think we currently ever test the flag in mac80211.

johannes

[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 828 bytes --]

Re: [PATCH] zd1211rw: Fix beacon filter flags thinko

[Michael Buesch]

On Monday 11 February 2008 13:53:51 Johannes Berg wrote:
> 
> On Sun, 2008-02-10 at 16:03 +0100, Michael Buesch wrote:
> > We must not clear the FIF_BCN_PRBRESP_PROMISC bit in the
> > new_flags. The zd-driver does support sending beacons and
> > probe responses to the host. What the flag does is say "Send me
> > all beacons and probe responses". And we actually do that. We always
> > do that, so we ignore the case when the bit is disabled. But that is
> > fine. But we must not clear the flag, as that tells mac80211 that
> > we do not support passing beacons and probe responses to the stack.
> > And that's not true.
> 
> Good explanation. Maybe it's needed with the filter flags defines/the
> config_filter callback description?

Yeah, I think so. Recent patches show that other people get it wrong, too. :)
I think I will submit a patch later.

-- 
Greetings Michael.