Please pull 'iwlwifi' branch of wireless-2.6

Please pull 'iwlwifi' branch of wireless-2.6

[John W. Linville]

Jeff & Dave,

Here it is -- it's big, it's...well...beautiful in its own way...well,
at least it seems to work... :-)

There are some outstanding issues.  The driver does more than it
probably should under the covers instead of in the stack, and the
issue of including headers with a "../../mac80211/..." path remains.
Still, I think it would be better to get this mainlined than to keep
it out of stream.

Thanks!

John

---

Patch available here:

	http://www.kernel.org/pub/linux/kernel/people/linville/wireless-2.6/iwlwifi/0001-iwlwifi-add-iwlwifi-wireless-drivers.patch

---

The following changes since commit 0d4cbb5e7f60b2f1a4d8b7f6ea4cc264262c7a01:
  Linus Torvalds (1):
        Linux 2.6.23-rc6

are available in the git repository at:

  git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6.git iwlwifi

Zhu Yi (1):
      iwlwifi: add iwlwifi wireless drivers

 MAINTAINERS                         |    9 +
 drivers/net/wireless/Kconfig        |  129 +
 drivers/net/wireless/Makefile       |   12 +
 drivers/net/wireless/iwl-3945-hw.h  |  118 +
 drivers/net/wireless/iwl-3945-rs.c  |  979 ++++
 drivers/net/wireless/iwl-3945-rs.h  |  191 +
 drivers/net/wireless/iwl-3945.c     | 2290 +++++++++
 drivers/net/wireless/iwl-3945.h     |   41 +
 drivers/net/wireless/iwl-4965-hw.h  |  581 +++
 drivers/net/wireless/iwl-4965-rs.c  | 2118 ++++++++
 drivers/net/wireless/iwl-4965-rs.h  |  266 +
 drivers/net/wireless/iwl-4965.c     | 4719 ++++++++++++++++++
 drivers/net/wireless/iwl-4965.h     |  341 ++
 drivers/net/wireless/iwl-channel.h  |  161 +
 drivers/net/wireless/iwl-commands.h | 1734 +++++++
 drivers/net/wireless/iwl-debug.h    |  149 +
 drivers/net/wireless/iwl-eeprom.h   |  336 ++
 drivers/net/wireless/iwl-helpers.h  |  255 +
 drivers/net/wireless/iwl-hw.h       |  537 ++
 drivers/net/wireless/iwl-io.h       |  470 ++
 drivers/net/wireless/iwl-priv.h     |  308 ++
 drivers/net/wireless/iwl-prph.h     |  229 +
 drivers/net/wireless/iwl-spectrum.h |   91 +
 drivers/net/wireless/iwl3945-base.c | 8732 ++++++++++++++++++++++++++++++++
 drivers/net/wireless/iwl4965-base.c | 9323 +++++++++++++++++++++++++++++++++++
 drivers/net/wireless/iwlwifi.h      |  713 +++
 26 files changed, 34832 insertions(+), 0 deletions(-)
 create mode 100644 drivers/net/wireless/iwl-3945-hw.h
 create mode 100644 drivers/net/wireless/iwl-3945-rs.c
 create mode 100644 drivers/net/wireless/iwl-3945-rs.h
 create mode 100644 drivers/net/wireless/iwl-3945.c
 create mode 100644 drivers/net/wireless/iwl-3945.h
 create mode 100644 drivers/net/wireless/iwl-4965-hw.h
 create mode 100644 drivers/net/wireless/iwl-4965-rs.c
 create mode 100644 drivers/net/wireless/iwl-4965-rs.h
 create mode 100644 drivers/net/wireless/iwl-4965.c
 create mode 100644 drivers/net/wireless/iwl-4965.h
 create mode 100644 drivers/net/wireless/iwl-channel.h
 create mode 100644 drivers/net/wireless/iwl-commands.h
 create mode 100644 drivers/net/wireless/iwl-debug.h
 create mode 100644 drivers/net/wireless/iwl-eeprom.h
 create mode 100644 drivers/net/wireless/iwl-helpers.h
 create mode 100644 drivers/net/wireless/iwl-hw.h
 create mode 100644 drivers/net/wireless/iwl-io.h
 create mode 100644 drivers/net/wireless/iwl-priv.h
 create mode 100644 drivers/net/wireless/iwl-prph.h
 create mode 100644 drivers/net/wireless/iwl-spectrum.h
 create mode 100644 drivers/net/wireless/iwl3945-base.c
 create mode 100644 drivers/net/wireless/iwl4965-base.c
 create mode 100644 drivers/net/wireless/iwlwifi.h
-- 
John W. Linville
linville-2XuSBdqkA4R54TAoqtyWWQ@public.gmane.org

Re: Please pull 'iwlwifi' branch of wireless-2.6

[David Miller]

From: "John W. Linville" <linville-2XuSBdqkA4R54TAoqtyWWQ@public.gmane.org>
Date: Tue, 18 Sep 2007 14:50:40 -0400

> Jeff & Dave,
> 
> Here it is -- it's big, it's...well...beautiful in its own way...well,
> at least it seems to work... :-)
> 
> There are some outstanding issues.  The driver does more than it
> probably should under the covers instead of in the stack, and the
> issue of including headers with a "../../mac80211/..." path remains.
> Still, I think it would be better to get this mainlined than to keep
> it out of stream.

Jeff, if you have no objections I'll pull this into net-2.6.24

Thanks.

Re: Please pull 'iwlwifi' branch of wireless-2.6

[Christoph Hellwig]

On Tue, Sep 18, 2007 at 02:50:40PM -0400, John W. Linville wrote:
> Jeff & Dave,
> 
> Here it is -- it's big, it's...well...beautiful in its own way...well,
> at least it seems to work... :-)
> 
> There are some outstanding issues.  The driver does more than it
> probably should under the covers instead of in the stack, and the
> issue of including headers with a "../../mac80211/..." path remains.
> Still, I think it would be better to get this mainlined than to keep
> it out of stream.

it really needs to be moved into a directory of it's own.
The useless per-file CFLAGS need to go most places can trivially
be made unconditional anyway.

The depends on m for CONFIG_IWL4965 and CONFIG_IWL3945 needs to go,
we don't put drivers int that need to be modular.

This is just a tiny review from the build system point of view.
> 
> Thanks!
> 
> John
> 
> ---
> 
> Patch available here:
> 
> 	http://www.kernel.org/pub/linux/kernel/people/linville/wireless-2.6/iwlwifi/0001-iwlwifi-add-iwlwifi-wireless-drivers.patch
> 
> ---
> 
> The following changes since commit 0d4cbb5e7f60b2f1a4d8b7f6ea4cc264262c7a01:
>   Linus Torvalds (1):
>         Linux 2.6.23-rc6
> 
> are available in the git repository at:
> 
>   git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6.git iwlwifi
> 
> Zhu Yi (1):
>       iwlwifi: add iwlwifi wireless drivers
> 
>  MAINTAINERS                         |    9 +
>  drivers/net/wireless/Kconfig        |  129 +
>  drivers/net/wireless/Makefile       |   12 +
>  drivers/net/wireless/iwl-3945-hw.h  |  118 +
>  drivers/net/wireless/iwl-3945-rs.c  |  979 ++++
>  drivers/net/wireless/iwl-3945-rs.h  |  191 +
>  drivers/net/wireless/iwl-3945.c     | 2290 +++++++++
>  drivers/net/wireless/iwl-3945.h     |   41 +
>  drivers/net/wireless/iwl-4965-hw.h  |  581 +++
>  drivers/net/wireless/iwl-4965-rs.c  | 2118 ++++++++
>  drivers/net/wireless/iwl-4965-rs.h  |  266 +
>  drivers/net/wireless/iwl-4965.c     | 4719 ++++++++++++++++++
>  drivers/net/wireless/iwl-4965.h     |  341 ++
>  drivers/net/wireless/iwl-channel.h  |  161 +
>  drivers/net/wireless/iwl-commands.h | 1734 +++++++
>  drivers/net/wireless/iwl-debug.h    |  149 +
>  drivers/net/wireless/iwl-eeprom.h   |  336 ++
>  drivers/net/wireless/iwl-helpers.h  |  255 +
>  drivers/net/wireless/iwl-hw.h       |  537 ++
>  drivers/net/wireless/iwl-io.h       |  470 ++
>  drivers/net/wireless/iwl-priv.h     |  308 ++
>  drivers/net/wireless/iwl-prph.h     |  229 +
>  drivers/net/wireless/iwl-spectrum.h |   91 +
>  drivers/net/wireless/iwl3945-base.c | 8732 ++++++++++++++++++++++++++++++++
>  drivers/net/wireless/iwl4965-base.c | 9323 +++++++++++++++++++++++++++++++++++
>  drivers/net/wireless/iwlwifi.h      |  713 +++
>  26 files changed, 34832 insertions(+), 0 deletions(-)
>  create mode 100644 drivers/net/wireless/iwl-3945-hw.h
>  create mode 100644 drivers/net/wireless/iwl-3945-rs.c
>  create mode 100644 drivers/net/wireless/iwl-3945-rs.h
>  create mode 100644 drivers/net/wireless/iwl-3945.c
>  create mode 100644 drivers/net/wireless/iwl-3945.h
>  create mode 100644 drivers/net/wireless/iwl-4965-hw.h
>  create mode 100644 drivers/net/wireless/iwl-4965-rs.c
>  create mode 100644 drivers/net/wireless/iwl-4965-rs.h
>  create mode 100644 drivers/net/wireless/iwl-4965.c
>  create mode 100644 drivers/net/wireless/iwl-4965.h
>  create mode 100644 drivers/net/wireless/iwl-channel.h
>  create mode 100644 drivers/net/wireless/iwl-commands.h
>  create mode 100644 drivers/net/wireless/iwl-debug.h
>  create mode 100644 drivers/net/wireless/iwl-eeprom.h
>  create mode 100644 drivers/net/wireless/iwl-helpers.h
>  create mode 100644 drivers/net/wireless/iwl-hw.h
>  create mode 100644 drivers/net/wireless/iwl-io.h
>  create mode 100644 drivers/net/wireless/iwl-priv.h
>  create mode 100644 drivers/net/wireless/iwl-prph.h
>  create mode 100644 drivers/net/wireless/iwl-spectrum.h
>  create mode 100644 drivers/net/wireless/iwl3945-base.c
>  create mode 100644 drivers/net/wireless/iwl4965-base.c
>  create mode 100644 drivers/net/wireless/iwlwifi.h
> -- 
> John W. Linville
> linville@tuxdriver.com
> -
> To unsubscribe from this list: send the line "unsubscribe linux-wireless" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html
---end quoted text---

Re: Please pull 'iwlwifi' branch of wireless-2.6

[Jeff Garzik]

David Miller wrote:
> Jeff, if you have no objections I'll pull this into net-2.6.24


Given that there is now a large backlog of new drivers to review, I 
think the preferred course of action would be to queue them into -mm 
(via net-2.6.24) for wider review and testing, and then make sure they 
all get a thorough review+ACK before pushing upstream.

So far, its sounding like each review has turned up stuff that wants 
fixing before the drivers commented upon go upstream.

	Jeff

Re: Please pull 'iwlwifi' branch of wireless-2.6

[John W. Linville]

On Wed, Sep 19, 2007 at 09:28:52AM -0400, Jeff Garzik wrote:
> David Miller wrote:
> >Jeff, if you have no objections I'll pull this into net-2.6.24

> Given that there is now a large backlog of new drivers to review, I 
> think the preferred course of action would be to queue them into -mm 
> (via net-2.6.24) for wider review and testing, and then make sure they 
> all get a thorough review+ACK before pushing upstream.

FWIW, all of the wireless drivers posted recently have been in -mm
for some time thanks to Andrew's pulls of wireless-dev.

> So far, its sounding like each review has turned up stuff that wants 
> fixing before the drivers commented upon go upstream.

I'm sure there are things worth fixing.  Feel free to comment and
I/we will scramble to make the appropriate changes.

John
-- 
John W. Linville
linville-2XuSBdqkA4R54TAoqtyWWQ@public.gmane.org

Re: Please pull 'iwlwifi' branch of wireless-2.6

[Zhu Yi]

On Wed, 2007-09-19 at 11:13 +0100, Christoph Hellwig wrote:
> it really needs to be moved into a directory of it's own.

It used to be... John?

> The useless per-file CFLAGS need to go most places can trivially
> be made unconditional anyway.

OK.

> The depends on m for CONFIG_IWL4965 and CONFIG_IWL3945 needs to go,
> we don't put drivers int that need to be modular. 

Since we splited the code base for 3945 and 4965 by a simple "fork" of
file iwl-base.c, some non-static functions names remain the same. Make
the two drivers build into vmlinux at the same time will cause conflict.
So to make them depend on m is a current workaround for .24. We will
abstract a common iwl-core.ko and make driver specific iwl3945.ko and
iwl4965.ko depend on it in .25 time frame.

Thanks,
-yi

Re: Please pull 'iwlwifi' branch of wireless-2.6

[John W. Linville]

On Fri, Sep 21, 2007 at 09:20:30AM +0800, Zhu Yi wrote:
> On Wed, 2007-09-19 at 11:13 +0100, Christoph Hellwig wrote:
> > it really needs to be moved into a directory of it's own.
> 
> It used to be... John?

Fine by me -- I guess I misinterpreted the some other statements to
make me think we wanted as flat a directory structure as possible.

John
-- 
John W. Linville
linville@tuxdriver.com

Re: Please pull 'iwlwifi' branch of wireless-2.6

[Christoph Hellwig]

On Fri, Sep 21, 2007 at 09:20:30AM +0800, Zhu Yi wrote:
> > The depends on m for CONFIG_IWL4965 and CONFIG_IWL3945 needs to go,
> > we don't put drivers int that need to be modular. 
> 
> Since we splited the code base for 3945 and 4965 by a simple "fork" of
> file iwl-base.c, some non-static functions names remain the same. Make
> the two drivers build into vmlinux at the same time will cause conflict.
> So to make them depend on m is a current workaround for .24. We will
> abstract a common iwl-core.ko and make driver specific iwl3945.ko and
> iwl4965.ko depend on it in .25 time frame.

This kind of stuff is not what we want to leak into mainline.  If you're
too busy to do that 5 minute sed search and replace I'll do it for you.

Re: Please pull 'iwlwifi' branch of wireless-2.6

[David Miller]

From: "John W. Linville" <linville@tuxdriver.com>
Date: Thu, 20 Sep 2007 21:34:03 -0400

> On Fri, Sep 21, 2007 at 09:20:30AM +0800, Zhu Yi wrote:
> > On Wed, 2007-09-19 at 11:13 +0100, Christoph Hellwig wrote:
> > > it really needs to be moved into a directory of it's own.
> > 
> > It used to be... John?
> 
> Fine by me -- I guess I misinterpreted the some other statements to
> make me think we wanted as flat a directory structure as possible.

I've taken care of this during the net-2.6.24 rebase I'm working
on today.