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-iwlwi...

---

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 |   ...
[ message continues ]

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.

---end quoted text---
-

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
-

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.
-

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
-

From: "John W. Linville" <linville@tuxdriver.com>

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

From: "John W. Linville" <linville@tuxdriver.com>

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

Thanks.
-

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


-

FWIW, all of the wireless drivers posted recently have been in -mm

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@tuxdriver.com
-