Re: [Bcm43xx-dev] wireless: the contenders

2006-01-19 Thread John W. Linville
On Thu, Jan 19, 2006 at 01:19:40AM +0100, Johannes Berg wrote: > On Wed, 2006-01-18 at 15:06 -0500, John W. Linville wrote: > > > The tree also has "softmac" and "dscape" branches. The "softmac" > > branch includes the Johannes Berg softmac code as well as the the > > BCM43xx driver based upon th

Re: [Bcm43xx-dev] wireless: the contenders

2006-01-19 Thread Johannes Berg
On Wed, 2006-01-18 at 15:06 -0500, John W. Linville wrote: > The tree also has "softmac" and "dscape" branches. The "softmac" > branch includes the Johannes Berg softmac code as well as the the > BCM43xx driver based upon that code. I guess that branch also contains my enhancements to ieee80211,

Re: wireless: the contenders

2006-01-18 Thread Jeff Garzik
On Wed, Jan 18, 2006 at 03:48:49PM -0500, John W. Linville wrote: > On Wed, Jan 18, 2006 at 03:36:59PM -0500, Jeff Garzik wrote: > > John W. Linville wrote: > > > >The "master" branch of that tree is (mostly) up-to-date w/ Linus, plus > > >changes I recently sent to Jeff. Those changes are also a

Re: wireless: the contenders

2006-01-18 Thread John W. Linville
On Wed, Jan 18, 2006 at 03:36:59PM -0500, Jeff Garzik wrote: > John W. Linville wrote: > >The "master" branch of that tree is (mostly) up-to-date w/ Linus, plus > >changes I recently sent to Jeff. Those changes are also available on > >the "upstream-jgarzik" branch, but it is frozen to when I req

Re: wireless: the contenders

2006-01-18 Thread Jeff Garzik
John W. Linville wrote: First, the news everyone will like. Thanks to the kernel.org team I now have a place to publish a wireless tree: git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6.git The tree there has a number of branches, so many that you need a scorecard... Bra

Re: [Bcm43xx-dev] wireless: the contenders

2006-01-18 Thread John W. Linville
On Wed, Jan 18, 2006 at 09:19:20PM +0100, Michael Buesch wrote: > On Wednesday 18 January 2006 21:06, John W. Linville wrote: > > The tree also has "softmac" and "dscape" branches. The "softmac" > > branch includes the Johannes Berg softmac code as well as the the > > BCM43xx driver based upon tha

Re: [Bcm43xx-dev] wireless: the contenders

2006-01-18 Thread Michael Buesch
On Wednesday 18 January 2006 21:06, John W. Linville wrote: > The tree also has "softmac" and "dscape" branches. The "softmac" > branch includes the Johannes Berg softmac code as well as the the > BCM43xx driver based upon that code. The "dscape" branch includes > the DeviceScape patches from Jir

wireless: the contenders

2006-01-18 Thread John W. Linville
First, the news everyone will like. Thanks to the kernel.org team I now have a place to publish a wireless tree: git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6.git The tree there has a number of branches, so many that you need a scorecard... Branches The "maste