prism2_usb both in staging and misc/wireless

Bug Description

SRU justification:

Impact: Due to a build race there was a chance to get the prism2_usb driver from ubuntu or staging being built. Looking at some released packages the staging driver won the race most of the time.

Fix: Make sure only the staging driver will be built in future by removing the unwanted driver completely.

Testcase: check prism2_usb driver in the package.

---

We now have the staging tree in Jaunty kernels. (I was a little bit surprised, so any pointers to the plans, policies or discussion about this would be awesome). I discovered that my prism2_usb device now was picked up by the staging driver.

I guess it was not planned that we now are shipping two prism2_usb.ko modules, one in staging and another in misc/wireless. But the good news is that the staging module seems to perform better than the old:
- my wlan always come up at boot. Previously I often had USB problems if it was plugged in, and I would have to unplug and replug it once or many times.
- after heavy usage (dist-upgrades etc) it would previously often get stuck (like if it was overheated) but now it seems stable, from my testing so far. YMMV.

So maybe we can delete the old misc/wireless version, which was also a nightmare to have synced and maintained, at least from my experience dealing with the kernel team.

I don't know if you have tools to detect other driver conflicts with staging.

@Tormod -- we are not supposed to be enabling the Staging drivers wholesale:

debian/config/amd64/config:CONFIG_STAGING_EXCLUDE_BUILD=y
debian/config/i386/config:CONFIG_STAGING_EXCLUDE_BUILD=y

And we are expecting to only be including these two drivers from staging at this time:

source "drivers/staging/rt2860/Kconfig"
source "drivers/staging/rt2870/Kconfig"

Cirtainly on my systems here I am only seeing one installed:

/lib/modules$ find 2.6.28-7-generic -name prism2_usb.ko
2.6.28-7-generic/kernel/drivers/staging/wlan-ng/prism2_usb.ko
/lib/modules$

Staging was picked up as a natural concequence of moving to 2.6.28, no particular policy decision was made to pick it up. As the staging area was seeded using the ubuntu drivers directory much of what we need is in there and is now being maintained so it makes sense for us to switch to the versions therein where possible. A fuller review is planned shortly.

@Tormod -- could you paste in your kernel version and the same find command for your kernel version. Thanks.

I get the same "find" result as you with 2.6.28-7-generic so there's only the staging one being built or shipped now.

@Tormod -- I assume what you saw was transitory and is now fixed. So will mark this fixed.

Andy, don't forget to remove the misc/wireless version from the Jaunty kernel source, if we are sure about using the staging one.

BTW, how come prism2_usb was built from staging if you didn't source the Kconfig like you did for rt2860/rt2870?

I am reopening this to track the cleanup of this. What seems to have happened is, that we created the first kernel _build_ race I know of. As we had CONFIG_STAGING enabled with CONFIG_STAGING_EXCLUDE set to y as well. The Kconfig part of staging was skipped but the staging subtree was included in the build. As the config option name for the staging/ driver and the one in ubuntu/ were the same, both object got build and I can only imagine, that it was a race (-j used) which tree went fist to linking.
The result was possibly the double inclusion that happened here but also the one or the other variant I have seen.
As it seems in the majority of cases wlan-ng won that race, so I will now
a) fix the staging pitfall (tracked in another bug) and
b) sectumsempra the ubuntu/ version of prism2_usb

Karmic does not have this issue.

Accepted linux into jaunty-proposed, the package will build now and be available in a few hours. Please test and give feedback here. See https://wiki.ubuntu.com/Testing/EnableProposed for documentation how to enable and use -proposed. Thank you in advance!

This bug was fixed in the package linux - 2.6.28-13.44

---------------
linux (2.6.28-13.44) jaunty-proposed; urgency=low

[ Stefan Bader ]

* Revert "SAUCE: [jaunty] ALSA: Add retry for Intel8x0 clock measurement"
* Revert "SAUCE: [jaunty] ALSA: Fix clock and buffer calculations for
Intel8x0"
* Revert "SAUCE: [jaunty] ALSA: Fix buffer positions and checks"

linux (2.6.28-12.43) jaunty-proposed; urgency=low

[ Amit Kucheria ]

* Enable SYN_COOKIES for iop32x and versatile flavours
- LP: #361687
* SAUCE: Quirk for BT USB device on MacbookPro to be reset before use
- LP: #332443

[ Brad Figg ]

* [jaunty] Add missing mvsas (Marvel SAS 6440) module configuration.
- LP: #352336

[ Chuck Short ]

* SAUCE: [USB] Unusual Device support for Gold MP3 Player Energy
- LP: #125250

[ Daniel T Chen ]

* SAUCE: [jaunty] ALSA: Fix buffer positions and checks
- LP: #345627
* SAUCE: [jaunty] ALSA: Fix clock and buffer calculations for Intel8x0
- LP: #345627
* SAUCE: [jaunty] ALSA: Add retry for Intel8x0 clock measurement
- LP: #345627

[ Luke Yelavich ]

* disable CONFIG_SND_HDA_INPUT_BEEP on amd64 and i386
- LP: #331589

[ Makito SHIOKAWA ]

* [ARM] 5404/1: Fix condition in arm_elf_read_implies_exec() to set
READ_IMPLIES_EXEC
- LP: #364358

[ Manoj Iyer ]

* SAUCE: Added quirk to fix key release for Samsung NC20
- LP: #360247

[ Oleg Nesterov ]

* posix timers: fix RLIMIT_CPU && fork()
- LP: #361508

[ Scott James Remnant ]

* [Config] Disable libusual and the ub driver
- LP: #364538

[ Stefan Bader ]

* Disable unwanted staging builds
- LP: #366144
* Remove prism2_usb driver from ubuntu and use the one from staging
- LP: #325366
* SAUCE: Make rtl8187se depend on WIRELESS_EXT
- LP: #366144
* Disable CONFIG_RTL8187SE for armel.versatile
- LP: #366144

[ Tejun Heo ]

* libata: handle SEMB signature better
- LP: #257790

[ Tim Gardner ]

* Set USB_SERIAL=m for i386/amd64
- LP: #345002
* SAUCE: Jaunty - aic79xx - set reset delay to 5 seconds, down from 15.
- LP: #79542
* SAUCE: (drop after 2.6.28) Wifi suspend/resume scan timeout fixes
- LP: #336055
* Sony laptop: Sony Vaio laptops do not enable wwan power by default.
- LP: #364678

[ Tyler Hicks ]

* SAUCE: (drop after 2.6.28) eCryptfs: Larger buffer for encrypted
symlink targets
- LP: #357345

[ Upstream Kernel Changes ]

* V4L/DVB (9999): gspca - zc3xx: Webcam 046d:089d added.
- LP: #326674
* V4L/DVB (10044): gspca - pac7311: Webcam 093a:2620 added.
- LP: #363195
* hwmon: (it87) Add support for the ITE IT8720F
- LP: #357766
* vgacon: Return the upper half of 512 character fonts
- LP: #355057
* drm/i915: add support for G41 chipset
- LP: #365958

-- Stefan Bader <email address hidden> 2009年5月25日 17:30:40 +0200