I've just completed the back mege of the WPA branch into HEAD.  The WPA branch 
should be considered dead and as soon as the public CVS is updated you should 
start pulling code from HEAD.

Shortly I'll be importing a new hal.  After these changes stabilize I'll be 
tagging the tree to create a stable branch from which a release candidate 
will be made.  Folks that want to track a stable version of the code will 
want to track code in that branch; development will take place in HEAD.

For those that have not been following the WPA branch note that the directory 
organization has changed.  The old driver and wlan directories are replaced 
by ath and net80211, respectively.  If you use

cvs up -dP

the old directories should be pruned so things will be less confusing.  The 
version strings on the updated code should be 0.9.3.0 for the ath driver and 
0.8.3.0 for the net80211 module.  The module names have not changed.

The only functionality that was in HEAD that was lost in this merge was the 
incomplete support for WME.  This will be brought back in to HEAD in a more 
developed form; probably after the stable branch is created.

	Sam

-------------------------------------------------------
This SF.Net email is sponsored by OSTG. Have you noticed the changes on
Linux.com, ITManagersJournal and NewsForge in the past few weeks? Now,
one more big change to announce. We are now OSTG- Open Source Technology
Group. Come see the changes on the new OSTG site. www.ostg.com