2008-01-28 09:07:49

by Larry Finger

[permalink] [raw]
Subject: mac80211 crash in ieee80211_sta_scan_work

Johannes,

With the latest wireless-2.6 git tree on my x86_64 system, I am getting a GPF in
ieee80211_sta_scan_work. I tracked it down to the following astatement:

if (!sband ||
(local->scan_channel_idx >= sband->n_channels &&
local->scan_band >= IEEE80211_NUM_BANDS)) {

Specifically, it is the "local->scan_channel_idx >= sband->n_channels" part of the if test. When I
added test prints of local->scan_channel_idx, local->scan_band, and sband, I got the following:

mac80211: scan_channel_idx = 0, scan_band = 0, sband = ffffffff882c2f10
mac80211: scan_channel_idx = 1, scan_band = 0, sband = ffffffff882c2f10
...
...
mac80211: scan_channel_idx = 13, scan_band = 0, sband = ffffffff882c2f10
mac80211: scan_channel_idx = 0, scan_band = 2, sband = dead4ead00000001
general protection fault: 0000 [1] SMP

As can be seen, "sband" is some kind of magic number and is an invalid pointer when scan_band is
larger than IEEE80211_NUM_BANDS, which causes the GPF.

With the following patch, it works:

Index: wireless-2.6/net/mac80211/ieee80211_sta.c
===================================================================
--- wireless-2.6.orig/net/mac80211/ieee80211_sta.c
+++ wireless-2.6/net/mac80211/ieee80211_sta.c
@@ -3237,8 +3237,7 @@ void ieee80211_sta_scan_work(struct work
}

if (!sband ||
- (local->scan_channel_idx >= sband->n_channels &&
- local->scan_band >= IEEE80211_NUM_BANDS)) {
+ local->scan_band >= IEEE80211_NUM_BANDS) {
ieee80211_scan_completed(local_to_hw(local));
return;
}

It seems to me that it should be OK to skip the scan_chan_idx >= sband->n_channels part of the test
as scan_band won't get to be >= to IEEE80211_NUM_BANDS until all the channels have been tested in
the legal bands.

Larry




2008-01-28 17:09:23

by Michael Büsch

[permalink] [raw]
Subject: Re: mac80211 crash in ieee80211_sta_scan_work

On Monday 28 January 2008 16:12:00 John W. Linville wrote:
> On Mon, Jan 28, 2008 at 11:48:51AM +0200, Tomas Winkler wrote:
> > On Jan 28, 2008 11:37 AM, <[email protected]> wrote:
> > > Quoting Tomas Winkler <[email protected]>:
> > >
> > > > There are too many issues with API change patch. I think it is a good
> > > > direction but it's really unstable I think we need to give another
> > > > round before it can be applied.
> > >
> > > That has already been applied. I suggest that you point out the
> > > iwl4965 bugs you generically reported so that they can be fixed as well.
> > >
> > We've seen already patches to be un-applied, reverted.
> > I'll fix the bugs that's not problem but it takes time. I'm just
> > worried about the other users that find driver unusable.
>
> I'm going to hold it back from 2.6.25. We can work on it for 2.6.26.

The new band API is really really needed. I already have dozens of FIXMEs
in b43 that will automatically go away once the mac80211 API is changed.
Lots of FIXMEs will be added if this is not merged.

Please apply this patch and apply fixes inside of the 2.6.25 development
cycle. We are in a _development_ kernel. Kernels _do_ break in development
stages. That is the whole reason why development kernels exist.

So if we push this patch to 2.6.26 another bug appears. Should we push
it to 2.6.27 then instead of simply fixing it in the development cycle?

Besides that, _nobody_ will test the patch, if it's not applied to your
tree. So the situation will not be better when you apply it in the
next development cycle.

And for users complaining about a development kernel being unusable, well,
what to say about them? I'd say the right answer would be: Go and use
a stable kernel!

Please realize that delaying this patch means increasing the pain for
driver developers that need this patch for another 80-100 days.

--
Greetings Michael.

2008-01-28 17:48:02

by Larry Finger

[permalink] [raw]
Subject: Re: mac80211 crash in ieee80211_sta_scan_work

Michael Buesch wrote:
> On Monday 28 January 2008 16:12:00 John W. Linville wrote:
>> I'm going to hold it back from 2.6.25. We can work on it for 2.6.26.
>
> The new band API is really really needed. I already have dozens of FIXMEs
> in b43 that will automatically go away once the mac80211 API is changed.
> Lots of FIXMEs will be added if this is not merged.
>
> Please apply this patch and apply fixes inside of the 2.6.25 development
> cycle. We are in a _development_ kernel. Kernels _do_ break in development
> stages. That is the whole reason why development kernels exist.
>
> So if we push this patch to 2.6.26 another bug appears. Should we push
> it to 2.6.27 then instead of simply fixing it in the development cycle?
>
> Besides that, _nobody_ will test the patch, if it's not applied to your
> tree. So the situation will not be better when you apply it in the
> next development cycle.
>
> And for users complaining about a development kernel being unusable, well,
> what to say about them? I'd say the right answer would be: Go and use
> a stable kernel!
>
> Please realize that delaying this patch means increasing the pain for
> driver developers that need this patch for another 80-100 days.
>

John,

I agree with Michael on this issue. Due to the uncertainty of the quality of my Internet connection
this winter, I no longer subscribe to linux-wireless, and I'm not sure of all the discussion that
went into the API change. I have, however, seen the FIXME's in b43. In addition, getting the code
into 2.6.25-rc1 will get a lot more testers.

One little anecdote about the bug in the subject may help convince you. I discovered this bug
shortly after the API change was committed to wireless-2.6, but I did not try to fix it until I
found that I could not apply Stefano's patch for rc80211_pid_algo() unless the API change was also
in the code. For me, laziness rules and I only worked on this bug when it was less work to fix it
than to modify Stefano's patch. With these two patches in place, the current development tree is
working fine with b43.

Larry



2008-01-28 15:20:43

by Michael Büsch

[permalink] [raw]
Subject: Re: mac80211 crash in ieee80211_sta_scan_work

On Monday 28 January 2008 10:48:51 Tomas Winkler wrote:
> On Jan 28, 2008 11:37 AM, <[email protected]> wrote:
> > Quoting Tomas Winkler <[email protected]>:
> >
> > > There are too many issues with API change patch. I think it is a good
> > > direction but it's really unstable I think we need to give another
> > > round before it can be applied.
> >
> > That has already been applied. I suggest that you point out the
> > iwl4965 bugs you generically reported so that they can be fixed as well.
> >
> We've seen already patches to be un-applied, reverted.
> I'll fix the bugs that's not problem but it takes time. I'm just
> worried about the other users that find driver unusable.

We are inside of a development kernel cycle. So where's the actual problem?
People should get kicked ass for assuming a dev kernel was stable. ;)

--
Greetings Michael.

2008-01-28 15:35:28

by John W. Linville

[permalink] [raw]
Subject: Re: mac80211 crash in ieee80211_sta_scan_work

On Mon, Jan 28, 2008 at 11:48:51AM +0200, Tomas Winkler wrote:
> On Jan 28, 2008 11:37 AM, <[email protected]> wrote:
> > Quoting Tomas Winkler <[email protected]>:
> >
> > > There are too many issues with API change patch. I think it is a good
> > > direction but it's really unstable I think we need to give another
> > > round before it can be applied.
> >
> > That has already been applied. I suggest that you point out the
> > iwl4965 bugs you generically reported so that they can be fixed as well.
> >
> We've seen already patches to be un-applied, reverted.
> I'll fix the bugs that's not problem but it takes time. I'm just
> worried about the other users that find driver unusable.

I'm going to hold it back from 2.6.25. We can work on it for 2.6.26.

John
--
John W. Linville
[email protected]

2008-01-28 18:33:14

by John W. Linville

[permalink] [raw]
Subject: Re: mac80211 crash in ieee80211_sta_scan_work

On Mon, Jan 28, 2008 at 10:46:34AM -0700, Larry Finger wrote:
> Michael Buesch wrote:
>> On Monday 28 January 2008 16:12:00 John W. Linville wrote:
>>> I'm going to hold it back from 2.6.25. We can work on it for 2.6.26.

>> Please apply this patch and apply fixes inside of the 2.6.25 development
>> cycle. We are in a _development_ kernel. Kernels _do_ break in development
>> stages. That is the whole reason why development kernels exist.

> I agree with Michael on this issue. Due to the uncertainty of the quality
> of my Internet connection this winter, I no longer subscribe to
> linux-wireless, and I'm not sure of all the discussion that went into the
> API change. I have, however, seen the FIXME's in b43. In addition, getting
> the code into 2.6.25-rc1 will get a lot more testers.

I think you guys are missing a couple of points...

One is that the 2.6.25 development cycle is closed. The merge window
is now open and when it closes the stabilization period will begin,
leading until the release of 2.6.25 in several weeks or 2-3 months.
Ideally any patches sent in the merge window should already have spent
time in the -mm tree. While that isn't always strictly enforced,
it does imply that huge patches with known breakages and unknown
remedies are not entirely welcome. :-)

The other point is that I am happy to keep this API change in
the wireless-2.6 tree for the 2.6.26 development cycle (which has
effectively already started). Those using wireless-2.6 and -mm will
have plenty of exposure to this patch. There will be plenty of time
to develop on top of this patch while avoiding unnecessary breakage
for normal users.

Please understand that this is the normal process. Since the API
change that was only merged into my tree on the same day as 2.6.24 was
released, merging the patch for 2.6.25 would be the (IMHO unnecessary)
exception.

Thanks

John
--
John W. Linville
[email protected]

2008-01-28 09:29:01

by Tomas Winkler

[permalink] [raw]
Subject: Re: mac80211 crash in ieee80211_sta_scan_work

On Jan 28, 2008 11:07 AM, Larry Finger <[email protected]> wrote:
> Johannes,
>
> With the latest wireless-2.6 git tree on my x86_64 system, I am getting a GPF in
> ieee80211_sta_scan_work. I tracked it down to the following astatement:
>
> if (!sband ||
> (local->scan_channel_idx >= sband->n_channels &&
> local->scan_band >= IEEE80211_NUM_BANDS)) {
>
> Specifically, it is the "local->scan_channel_idx >= sband->n_channels" part of the if test. When I
> added test prints of local->scan_channel_idx, local->scan_band, and sband, I got the following:
>
> mac80211: scan_channel_idx = 0, scan_band = 0, sband = ffffffff882c2f10
> mac80211: scan_channel_idx = 1, scan_band = 0, sband = ffffffff882c2f10
> ...
> ...
> mac80211: scan_channel_idx = 13, scan_band = 0, sband = ffffffff882c2f10
> mac80211: scan_channel_idx = 0, scan_band = 2, sband = dead4ead00000001
> general protection fault: 0000 [1] SMP
>
> As can be seen, "sband" is some kind of magic number and is an invalid pointer when scan_band is
> larger than IEEE80211_NUM_BANDS, which causes the GPF.
>
> With the following patch, it works:
>
> Index: wireless-2.6/net/mac80211/ieee80211_sta.c
> ===================================================================
> --- wireless-2.6.orig/net/mac80211/ieee80211_sta.c
> +++ wireless-2.6/net/mac80211/ieee80211_sta.c
> @@ -3237,8 +3237,7 @@ void ieee80211_sta_scan_work(struct work
> }
>
> if (!sband ||
> - (local->scan_channel_idx >= sband->n_channels &&
> - local->scan_band >= IEEE80211_NUM_BANDS)) {
> + local->scan_band >= IEEE80211_NUM_BANDS) {
> ieee80211_scan_completed(local_to_hw(local));
> return;
> }
>
> It seems to me that it should be OK to skip the scan_chan_idx >= sband->n_channels part of the test
> as scan_band won't get to be >= to IEEE80211_NUM_BANDS until all the channels have been tested in
> the legal bands.
>
> Larry

There are too many issues with API change patch. I think it is a good
direction but it's really unstable I think we need to give another
round before it can be applied.
Thanks
Tomas

>

2008-01-28 12:44:17

by Bas Hulsken

[permalink] [raw]
Subject: Re: mac80211 crash in ieee80211_sta_scan_work

Johannes,

as I've previously mentioned in a private mail to you, I was getting a
similar oops (see info& trace below) for both rt2500pci and rtl8187,
also on the moment the interface went up. I can confirm that applying
Larry's patch prevents this oops from occurring.

Bas

uname -a:
steady.steadydecline.net 2.6.24-rc7_928_g40dfd0a_wireless #1 SMP Sat Jan
19 18:40:34 CET 2008 x86_64 x86_64 x86_64 GNU/Linux

trace:
general protection fault: 0000 [1] SMP
CPU 1
Modules linked in: nfsd lockd nfs_acl auth_rpcgss exportfs rfcomm l2cap
autofs4
sunrpc ipt_REJECT xt_multiport iptable_filter ipt_MASQUERADE
ipt_REDIRECT iptabl
e_nat nf_nat nf_conntrack_ipv4 ipt_TOS iptable_mangle ip_tables
nf_conntrack_ipv
6 xt_state nf_conntrack xt_tcpudp ip6t_ipv6header ip6t_REJECT
ip6table_filter ip
6_tables x_tables ipv6 cpufreq_ondemand acpi_cpufreq ext2 dm_mirror
dm_multipath
dm_mod wm8775 cx25840 msp3400 saa7115 tuner tea5767 tda8290
tuner_simple mt20xx
tea5761 ivtv snd_hda_intel i2c_algo_bit cx2341x arc4 ecb snd_seq_dummy
tveeprom blkcipher videodev i2c_i801 rt2500pci rt2x00pci snd_seq_oss
snd_seq_midi_event i2c_core rt2x00lib v4l2_common rtc_cmos floppy
firewire_ohci v4l1_compat snd_seq rfkill firewire_core r8169 iTCO_wdt
pcspkr input_polldev iTCO_vendor_support crc_itu_t sky2 hci_usb
snd_seq_device bluetooth snd_pcm_oss ati_remote2 snd_mixer_oss snd_pcm
rtl8187 snd_timer mac80211 snd_page_alloc snd_hwdep eeprom_93cx6 snd
soundcore cfg80211 button sr_mod cdrom sg ahci pata_jmicron ata_generic
ata_piix pata_acpi libata sd_mod scsi_mod raid456 async_xor async_memcpy
async_tx xor ext3 jbd mbcache uhci_hcd ohci_hcd ehci_hcd
Pid: 1420, comm: rt2500pci Not tainted 2.6.24-rc7_928_g40dfd0a_wireless
#1
RIP: 0010:[<ffffffff88157cfd>]
[<ffffffff88157cfd>] :mac80211:ieee80211_sta_scan_work+0x8d/0x19e
RSP: 0018:ffff81012dd4be70 EFLAGS: 00010282
RAX: 0000000000000000 RBX: ffff81012d8f51e8 RCX: ffff81012d865900
RDX: ffff81012d8f4140 RSI: 000000000015fac3 RDI: ffff81012d8f51e0
RBP: ffff81012d8f44c0 R08: 0000000000000000 R09: 0000000000000000
R10: ffffffff810478d0 R11: ffffffff8101cbb8 R12: dead4ead00000001
R13: ffff81012d865000 R14: ffffffff814c1c40 R15: 0000000000000000
FS: 0000000000000000(0000) GS:ffff81012fc01708(0000)
knlGS:0000000000000000
CS: 0010 DS: 0018 ES: 0018 CR0: 000000008005003b
CR2: 00002aaaab3859c0 CR3: 0000000122c35000 CR4: 00000000000006a0
DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000
DR3: 0000000000000000 DR6: 00000000ffff0ff0 DR7: 0000000000000400
Process rt2500pci (pid: 1420, threadinfo ffff81012dd4a000, task
ffff81012dd3a000)
Stack: 0000000000000000 ffff81012d8f51e8 ffff81012c8eb668
ffff81012d8f51e0
ffffffff88157c70 ffffffff8104791a ffffffff88170708 0000000000000000
ffffffff88163473 0000000000000003 ffff81012cc55a88 ffff81012c8eb668
Call Trace:
[<ffffffff88157c70>] :mac80211:ieee80211_sta_scan_work+0x0/0x19e
[<ffffffff8104791a>] run_workqueue+0xdf/0x1df
[<ffffffff810483e7>] worker_thread+0x0/0xe7
[<ffffffff810484c4>] worker_thread+0xdd/0xe7
[<ffffffff8104b95e>] autoremove_wake_function+0x0/0x2e
[<ffffffff8104b83e>] kthread+0x47/0x75
[<ffffffff81270ef0>] trace_hardirqs_on_thunk+0x35/0x3a
[<ffffffff8100ce28>] child_rip+0xa/0x12
[<ffffffff8100c53f>] restore_args+0x0/0x30
[<ffffffff8104b7f7>] kthread+0x0/0x75
[<ffffffff8100ce1e>] child_rip+0x0/0x12


Code: 41 3b 44 24 14 7c 18 83 bd 10 0d 00 00 01 76 0f 48 89 ef 5d
RIP [<ffffffff88157cfd>] :mac80211:ieee80211_sta_scan_work+0x8d/0x19e
RSP <ffff81012dd4be70>
---[ end trace 3f0208667981ef08 ]---




On Mon, 2008-01-28 at 02:07 -0700, Larry Finger wrote:
> Johannes,
>
> With the latest wireless-2.6 git tree on my x86_64 system, I am getting a GPF in
> ieee80211_sta_scan_work. I tracked it down to the following astatement:
>
> if (!sband ||
> (local->scan_channel_idx >= sband->n_channels &&
> local->scan_band >= IEEE80211_NUM_BANDS)) {
>
> Specifically, it is the "local->scan_channel_idx >= sband->n_channels" part of the if test. When I
> added test prints of local->scan_channel_idx, local->scan_band, and sband, I got the following:
>
> mac80211: scan_channel_idx = 0, scan_band = 0, sband = ffffffff882c2f10
> mac80211: scan_channel_idx = 1, scan_band = 0, sband = ffffffff882c2f10
> ...
> ...
> mac80211: scan_channel_idx = 13, scan_band = 0, sband = ffffffff882c2f10
> mac80211: scan_channel_idx = 0, scan_band = 2, sband = dead4ead00000001
> general protection fault: 0000 [1] SMP
>
> As can be seen, "sband" is some kind of magic number and is an invalid pointer when scan_band is
> larger than IEEE80211_NUM_BANDS, which causes the GPF.
>
> With the following patch, it works:
>
> Index: wireless-2.6/net/mac80211/ieee80211_sta.c
> ===================================================================
> --- wireless-2.6.orig/net/mac80211/ieee80211_sta.c
> +++ wireless-2.6/net/mac80211/ieee80211_sta.c
> @@ -3237,8 +3237,7 @@ void ieee80211_sta_scan_work(struct work
> }
>
> if (!sband ||
> - (local->scan_channel_idx >= sband->n_channels &&
> - local->scan_band >= IEEE80211_NUM_BANDS)) {
> + local->scan_band >= IEEE80211_NUM_BANDS) {
> ieee80211_scan_completed(local_to_hw(local));
> return;
> }
>
> It seems to me that it should be OK to skip the scan_chan_idx >= sband->n_channels part of the test
> as scan_band won't get to be >= to IEEE80211_NUM_BANDS until all the channels have been tested in
> the legal bands.
>
> Larry
>
>
> -
> To unsubscribe from this list: send the line "unsubscribe linux-wireless" in
> the body of a message to [email protected]
> More majordomo info at http://vger.kernel.org/majordomo-info.html


2008-01-28 09:48:51

by Tomas Winkler

[permalink] [raw]
Subject: Re: mac80211 crash in ieee80211_sta_scan_work

On Jan 28, 2008 11:37 AM, <[email protected]> wrote:
> Quoting Tomas Winkler <[email protected]>:
>
> > There are too many issues with API change patch. I think it is a good
> > direction but it's really unstable I think we need to give another
> > round before it can be applied.
>
> That has already been applied. I suggest that you point out the
> iwl4965 bugs you generically reported so that they can be fixed as well.
>
We've seen already patches to be un-applied, reverted.
I'll fix the bugs that's not problem but it takes time. I'm just
worried about the other users that find driver unusable.

Thanks
Tomas

> --
> Ciao
> Stefano
>
>
>
>

2008-01-28 18:42:37

by Michael Büsch

[permalink] [raw]
Subject: Re: mac80211 crash in ieee80211_sta_scan_work

On Monday 28 January 2008 19:19:00 John W. Linville wrote:
> On Mon, Jan 28, 2008 at 10:46:34AM -0700, Larry Finger wrote:
> > Michael Buesch wrote:
> >> On Monday 28 January 2008 16:12:00 John W. Linville wrote:
> >>> I'm going to hold it back from 2.6.25. We can work on it for 2.6.26.
>
> >> Please apply this patch and apply fixes inside of the 2.6.25 development
> >> cycle. We are in a _development_ kernel. Kernels _do_ break in development
> >> stages. That is the whole reason why development kernels exist.
>
> > I agree with Michael on this issue. Due to the uncertainty of the quality
> > of my Internet connection this winter, I no longer subscribe to
> > linux-wireless, and I'm not sure of all the discussion that went into the
> > API change. I have, however, seen the FIXME's in b43. In addition, getting
> > the code into 2.6.25-rc1 will get a lot more testers.
>
> I think you guys are missing a couple of points...
>
> One is that the 2.6.25 development cycle is closed. The merge window
> is now open and when it closes the stabilization period will begin,
> leading until the release of 2.6.25 in several weeks or 2-3 months.
> Ideally any patches sent in the merge window should already have spent
> time in the -mm tree. While that isn't always strictly enforced,
> it does imply that huge patches with known breakages and unknown
> remedies are not entirely welcome. :-)
>
> The other point is that I am happy to keep this API change in
> the wireless-2.6 tree for the 2.6.26 development cycle (which has

While I still completely disagree with you, I'm happy that you will
be handling all maintaining, merging, porting and stuff that will be
needed then.
So I'm OK with that, as long as I don't have to worry about porting
stuff around (and I will _not_ port stuff that depends on the new API
to the old API. Even bugfixes. Somebody else please do that then).

--
Greetings Michael.

2008-01-28 09:39:23

by Stefano Brivio

[permalink] [raw]
Subject: Re: mac80211 crash in ieee80211_sta_scan_work

Quoting Tomas Winkler <[email protected]>:

> There are too many issues with API change patch. I think it is a good
> direction but it's really unstable I think we need to give another
> round before it can be applied.

That has already been applied. I suggest that you point out the
iwl4965 bugs you generically reported so that they can be fixed as well.


--
Ciao
Stefano




2008-01-28 17:27:32

by Jory A. Pratt

[permalink] [raw]
Subject: Re: mac80211 crash in ieee80211_sta_scan_work

Larry Finger wrote:
> Johannes,
>
> With the latest wireless-2.6 git tree on my x86_64 system, I am getting a GPF in
> ieee80211_sta_scan_work. I tracked it down to the following astatement:
>
> if (!sband ||
> (local->scan_channel_idx >= sband->n_channels &&
> local->scan_band >= IEEE80211_NUM_BANDS)) {
>
> Specifically, it is the "local->scan_channel_idx >= sband->n_channels" part of the if test. When I
> added test prints of local->scan_channel_idx, local->scan_band, and sband, I got the following:
>
> mac80211: scan_channel_idx = 0, scan_band = 0, sband = ffffffff882c2f10
> mac80211: scan_channel_idx = 1, scan_band = 0, sband = ffffffff882c2f10
> ...
> ...
> mac80211: scan_channel_idx = 13, scan_band = 0, sband = ffffffff882c2f10
> mac80211: scan_channel_idx = 0, scan_band = 2, sband = dead4ead00000001
> general protection fault: 0000 [1] SMP
>
> As can be seen, "sband" is some kind of magic number and is an invalid pointer when scan_band is
> larger than IEEE80211_NUM_BANDS, which causes the GPF.
>
> With the following patch, it works:
>
> Index: wireless-2.6/net/mac80211/ieee80211_sta.c
> ===================================================================
> --- wireless-2.6.orig/net/mac80211/ieee80211_sta.c
> +++ wireless-2.6/net/mac80211/ieee80211_sta.c
> @@ -3237,8 +3237,7 @@ void ieee80211_sta_scan_work(struct work
> }
>
> if (!sband ||
> - (local->scan_channel_idx >= sband->n_channels &&
> - local->scan_band >= IEEE80211_NUM_BANDS)) {
> + local->scan_band >= IEEE80211_NUM_BANDS) {
> ieee80211_scan_completed(local_to_hw(local));
> return;
> }
>
> It seems to me that it should be OK to skip the scan_chan_idx >= sband->n_channels part of the test
> as scan_band won't get to be >= to IEEE80211_NUM_BANDS until all the channels have been tested in
> the legal bands.
>
> Larry
>

Larry patch works great it puts the development tree back into a useable
state for broadcom devices. This should be pushed to wireless-2.6 if
Johannes will ack it.

-Jory