[PATCH] remove wrong probe_resp_plcp write

[PATCH] remove wrong probe_resp_plcp write

[gregor kowski]

The tkip hw support uncovered a bug in b43_write_probe_resp_template : it is
writing at the wrong shm offset, it is in the B43_SHM_SH_TKIPTSCTTAK zone. This
patch comments these writes.

Signed-off-by: Gregor Kowski <gregor.kowski@gmail.com>

Index: linux-2.6/drivers/net/wireless/b43/main.c
===================================================================
--- linux-2.6.orig/drivers/net/wireless/b43/main.c	2009-07-31
20:32:21.000000000 +0000
+++ linux-2.6/drivers/net/wireless/b43/main.c	2009-07-31
20:32:28.000000000 +0000
@@ -1505,10 +1505,13 @@
 	/* Looks like PLCP headers plus packet timings are stored for
 	 * all possible basic rates
 	 */
+	/* FIXME this is the wrong offset : it goes in tkip rx phase1 shm */
+#if 0
 	b43_write_probe_resp_plcp(dev, 0x31A, size, &b43_b_ratetable[0]);
 	b43_write_probe_resp_plcp(dev, 0x32C, size, &b43_b_ratetable[1]);
 	b43_write_probe_resp_plcp(dev, 0x33E, size, &b43_b_ratetable[2]);
 	b43_write_probe_resp_plcp(dev, 0x350, size, &b43_b_ratetable[3]);
+#endif

 	size = min((size_t) size, 0x200 - sizeof(struct b43_plcp_hdr6));
 	b43_write_template_common(dev, probe_resp_data,

Re: [PATCH] remove wrong probe_resp_plcp write

[Michael Buesch]

On Friday 31 July 2009 22:35:49 gregor kowski wrote:
> The tkip hw support uncovered a bug in b43_write_probe_resp_template : it is
> writing at the wrong shm offset, it is in the B43_SHM_SH_TKIPTSCTTAK zone. This
> patch comments these writes.
> 
> Signed-off-by: Gregor Kowski <gregor.kowski@gmail.com>

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

> 
> Index: linux-2.6/drivers/net/wireless/b43/main.c
> ===================================================================
> --- linux-2.6.orig/drivers/net/wireless/b43/main.c	2009-07-31
> 20:32:21.000000000 +0000
> +++ linux-2.6/drivers/net/wireless/b43/main.c	2009-07-31
> 20:32:28.000000000 +0000
> @@ -1505,10 +1505,13 @@
>  	/* Looks like PLCP headers plus packet timings are stored for
>  	 * all possible basic rates
>  	 */
> +	/* FIXME this is the wrong offset : it goes in tkip rx phase1 shm */
> +#if 0
>  	b43_write_probe_resp_plcp(dev, 0x31A, size, &b43_b_ratetable[0]);
>  	b43_write_probe_resp_plcp(dev, 0x32C, size, &b43_b_ratetable[1]);
>  	b43_write_probe_resp_plcp(dev, 0x33E, size, &b43_b_ratetable[2]);
>  	b43_write_probe_resp_plcp(dev, 0x350, size, &b43_b_ratetable[3]);
> +#endif
> 
>  	size = min((size_t) size, 0x200 - sizeof(struct b43_plcp_hdr6));
>  	b43_write_template_common(dev, probe_resp_data,
> 
> 



-- 
Greetings, Michael.

Re: [PATCH] remove wrong probe_resp_plcp write

[John W. Linville]

On Fri, Jul 31, 2009 at 10:38:14PM +0200, Michael Buesch wrote:
> On Friday 31 July 2009 22:35:49 gregor kowski wrote:
> > The tkip hw support uncovered a bug in b43_write_probe_resp_template : it is
> > writing at the wrong shm offset, it is in the B43_SHM_SH_TKIPTSCTTAK zone. This
> > patch comments these writes.
> > 
> > Signed-off-by: Gregor Kowski <gregor.kowski@gmail.com>
> 
> Signed-off-by: Michael Buesch <mb@bu3sch.de>

  CC [M]  drivers/net/wireless/b43/main.o
drivers/net/wireless/b43/main.c:1432: warning: ‘b43_write_probe_resp_plcp’ defined but not used

Comment it out too?  Or are you going to fix the block that has been
commented-out here?

John
-- 
John W. Linville		Someday the world will need a hero, and you
linville@tuxdriver.com			might be all we have.  Be ready.
			¡Viva Honduras Libre!

Re: [PATCH] remove wrong probe_resp_plcp write

[Michael Buesch]

On Tuesday 04 August 2009 18:05:58 John W. Linville wrote:
> On Fri, Jul 31, 2009 at 10:38:14PM +0200, Michael Buesch wrote:
> > On Friday 31 July 2009 22:35:49 gregor kowski wrote:
> > > The tkip hw support uncovered a bug in b43_write_probe_resp_template : it is
> > > writing at the wrong shm offset, it is in the B43_SHM_SH_TKIPTSCTTAK zone. This
> > > patch comments these writes.
> > > 
> > > Signed-off-by: Gregor Kowski <gregor.kowski@gmail.com>
> > 
> > Signed-off-by: Michael Buesch <mb@bu3sch.de>
> 
>   CC [M]  drivers/net/wireless/b43/main.o
> drivers/net/wireless/b43/main.c:1432: warning: ‘b43_write_probe_resp_plcp’ defined but not used
> 
> Comment it out too?  Or are you going to fix the block that has been
> commented-out here?

No, please add
#if 0
void b43_write_probe_resp_plcp(...)
{
...
}
#endif /* 0 */

to comment out the function, too.
The probe response offload is currently not supported by mac80211.

-- 
Greetings, Michael.

Re: [PATCH] remove wrong probe_resp_plcp write

[Johannes Berg]

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

On Tue, 2009-08-04 at 22:27 +0200, Michael Buesch wrote:
> On Tuesday 04 August 2009 18:05:58 John W. Linville wrote:
> > On Fri, Jul 31, 2009 at 10:38:14PM +0200, Michael Buesch wrote:
> > > On Friday 31 July 2009 22:35:49 gregor kowski wrote:
> > > > The tkip hw support uncovered a bug in b43_write_probe_resp_template : it is
> > > > writing at the wrong shm offset, it is in the B43_SHM_SH_TKIPTSCTTAK zone. This
> > > > patch comments these writes.
> > > > 
> > > > Signed-off-by: Gregor Kowski <gregor.kowski@gmail.com>
> > > 
> > > Signed-off-by: Michael Buesch <mb@bu3sch.de>
> > 
> >   CC [M]  drivers/net/wireless/b43/main.o
> > drivers/net/wireless/b43/main.c:1432: warning: ‘b43_write_probe_resp_plcp’ defined but not used
> > 
> > Comment it out too?  Or are you going to fix the block that has been
> > commented-out here?
> 
> No, please add
> #if 0
> void b43_write_probe_resp_plcp(...)
> {
> ...
> }
> #endif /* 0 */
> 
> to comment out the function, too.
> The probe response offload is currently not supported by mac80211.

Just remove it -- if we need it back we can find it in the git archives,
and it's rather unlikely that we're going to add that functionality to
mac80211 and hostapd unless you'll push it.

johannes

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

Re: [PATCH] remove wrong probe_resp_plcp write

[gregor kowski]

On 8/4/09, Johannes Berg <johannes@sipsolutions.net> wrote:
> On Tue, 2009-08-04 at 22:27 +0200, Michael Buesch wrote:
>
> Just remove it -- if we need it back we can find it in the git archives,
> and it's rather unlikely that we're going to add that functionality to
> mac80211 and hostapd unless you'll push it.
>
What should be removed ?
b43_write_probe_resp_template and b43_write_probe_resp_plcp ?

Gregor

Re: [PATCH] remove wrong probe_resp_plcp write

[Michael Buesch]

On Tuesday 04 August 2009 23:58:45 gregor kowski wrote:
> On 8/4/09, Johannes Berg <johannes@sipsolutions.net> wrote:
> > On Tue, 2009-08-04 at 22:27 +0200, Michael Buesch wrote:
> >
> > Just remove it -- if we need it back we can find it in the git archives,
> > and it's rather unlikely that we're going to add that functionality to
> > mac80211 and hostapd unless you'll push it.
> >
> What should be removed ?
> b43_write_probe_resp_template and b43_write_probe_resp_plcp ?

yes

-- 
Greetings, Michael.