Commit Graph

67 Commits

Author SHA1 Message Date
Jeff Garzik
d011e151bc Merge /spare/repo/netdev-2.6 branch 'ieee80211' 2005-06-28 00:46:58 -04:00
Jeff Garzik
2179a59db1 Merge /spare/repo/linux-2.6/ 2005-06-28 00:46:46 -04:00
Jeff Garzik
30b4d6565e Merge /spare/repo/netdev-2.6 branch 'ieee80211' 2005-06-27 23:45:25 -04:00
Andrew Morton
ad3fee560b [PATCH] wireless-device-attr-fixes-2
More fixes for greg depredations.

Also nuke lots of pointless typecasts.

All this new wireless code adds near-infinite amounts of trailing whitespace.

Cc: Jeff Garzik <jgarzik@pobox.com>
Cc: Greg KH <greg@kroah.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
2005-06-27 23:37:30 -04:00
Andrew Morton
edfc43f2ec [PATCH] wireless-device-attr-fixes
Repair Jeff's stuff after gregkh depredations.

Cc: Jeff Garzik <jgarzik@pobox.com>
Cc: Greg KH <greg@kroah.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
2005-06-27 23:37:29 -04:00
Andrew Morton
011fe95a3b [PATCH] ipw2100 old gcc fix
drivers/net/wireless/ipw2100.c: In function `ipw2100_set_key_index':
drivers/net/wireless/ipw2100.c:5326: array index in non-array initializer
drivers/net/wireless/ipw2100.c:5326: (near initialization for `cmd')
drivers/net/wireless/ipw2100.c:5326: warning: missing braces around initializer
drivers/net/wireless/ipw2100.c:5326: warning: (near initialization for `cmd.host_command_parameters')

Cc: Jeff Garzik <jgarzik@pobox.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
2005-06-27 23:28:35 -04:00
Pavel Machek
8724a11803 [PATCH] ipw2100: small cleanups
Fix few typos/thinkos in ipw, remove ugly macro (it is commented around,
anyway), and fix types passed to pci_set_power_state.

Signed-off-by: Andrew Morton <akpm@osdl.org>
2005-06-27 23:26:31 -04:00
Pavel Machek
5dc54a65b6 [PATCH] ipw2100: kill dead macros
There are several never used macros in ipw2100.  This removes them.

Signed-off-by: Pavel Machek <pavel@suse.cz>
Signed-off-by: Andrew Morton <akpm@osdl.org>
2005-06-27 23:26:30 -04:00
Pavel Machek
4663663f1d [PATCH] ipw2100: assume recent kernel
ipw2100 still has support for old kernels.  Thats considered bad for patch in
mainline...  this fixes few instances.

Signed-off-by: Pavel Machek <pavel@suse.cz>
Signed-off-by: Andrew Morton <akpm@osdl.org>
2005-06-27 23:26:30 -04:00
Tobias Klauser
0e08b44eed [PATCH] drivers/net/wireless/ipw2200: Use the DMA_32BIT_MASK constant
Use the DMA_32BIT_MASK constant from dma-mapping.h when calling
pci_set_dma_mask() or pci_set_consistent_dma_mask() instead of custom macros.

This patch includes dma-mapping.h explicitly because it caused errors on some
architectures otherwise.  See
http://marc.theaimsgroup.com/?t=108001993000001&r=1&w=2 for details

Signed-off-by: Tobias Klauser <tklauser@nuerscht.ch>
Cc: Jeff Garzik <jgarzik@pobox.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
2005-06-27 23:25:10 -04:00
Tobias Klauser
05743d165b [PATCH] drivers/net/wireless/ipw2100: Use the DMA_32BIT_MASK constant
Use the DMA_32BIT_MASK constant from dma-mapping.h when calling
pci_set_dma_mask() or pci_set_consistent_dma_mask() instead of custom macros.

This patch includes dma-mapping.h explicitly because it caused errors on some
architectures otherwise.  See
http://marc.theaimsgroup.com/?t=108001993000001&r=1&w=2 for details

Signed-off-by: Tobias Klauser <tklauser@nuerscht.ch>
Cc: Jeff Garzik <jgarzik@pobox.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
2005-06-27 23:25:10 -04:00
Pavel Machek
070d016512 [PATCH] ipw2100: remove commented-out code
This removes up various code/defines that was just commented out
instead of being deleted.
2005-06-27 23:24:18 -04:00
Jiri Benc
aaa4d308a8 [PATCH] ieee80211: fix ipw 64bit compilation warnings
On Mon, 06 Jun 2005 14:29:52 +0800, Zhu Yi wrote:
> ("%zd", sizeof()) should be better.

Thanks. This is a corrected version of the patch.

This patch fixes warnings when compiling ipw2100 and ipw2200 on x86_64.

Signed-off-by: Jiri Benc <jbenc@suse.cz>
Signed-off-by: Jirka Bohac <jbohac@suse.cz>
2005-06-27 23:13:59 -04:00
Adrian Bunk
e19b813e0c [PATCH] ieee80211: fix recursive ipw2200 dependencies
This results in recursive dependencies:
- IPW2200 depends on NET_RADIO
- IPW2200 selects IEEE80211
- IEEE80211 selects NET_RADIO

This patch fixes the IPW2200 dependencies in a way that they are similar
to the IPW2100 dependencies.

Signed-off-by: Adrian Bunk <bunk@stusta.de>
Signed-off-by: Jiri Benc <jbenc@suse.cz>
2005-06-27 23:12:35 -04:00
Jeff Garzik
aa8f6dfd35 Merge /spare/repo/netdev-2.6 branch 'ieee80211' 2005-06-27 22:50:10 -04:00
Jeff Garzik
716b43303d Merge upstream ieee80211.h with us (us == branch 'ieee80211' of netdev-2.6) 2005-06-27 22:03:52 -04:00
Dominik Brodowski
77b73f9b00 [PATCH] pcmcia: id_table for wl3501_cs.c
Add pcmcia_device_id table.

Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2005-06-27 18:03:16 -07:00
Dominik Brodowski
4a17a11938 [PATCH] pcmcia: id_table for atmel_cs.c
Add pcmcia_device_id table.

Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2005-06-27 18:03:14 -07:00
Dominik Brodowski
7422c56da9 [PATCH] pcmcia: id_table for orinoco_cs
Add pcmcia_device_id table.

Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2005-06-27 18:03:12 -07:00
Dominik Brodowski
b942123bcd [PATCH] pcmcia: id_table for wavelan_cs
Add pcmcia_device_id table.

Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2005-06-27 18:03:11 -07:00
Dominik Brodowski
f57ea2a232 [PATCH] pcmcia: id_table for ray_cs
Add pcmcia_device_id table.

Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2005-06-27 18:03:11 -07:00
Dominik Brodowski
5d402e95eb [PATCH] pcmcia: id_table for netwave_cs
Add pcmcia_device_id table.

Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2005-06-27 18:03:10 -07:00
Dominik Brodowski
7018d06d23 [PATCH] pcmcia: id_table for airo_cs
Add pcmcia_device_id table.

Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2005-06-27 18:03:09 -07:00
Olaf Hering
05ab195c98 [PATCH] uninitialized variable in prism54 isl38xx_trigger_device
drivers/net/wireless/prism54/isl_38xx.c:131: warning: 'current_time.tv_sec' is used uninitialized in this function
drivers/net/wireless/prism54/isl_38xx.c:131: warning: 'current_time.tv_usec' is used uninitialized in this function

Signed-off-by: Olaf Hering <olh@suse.de>
2005-06-27 00:44:48 -04:00
Jeff Garzik
9758d0f028 Merge /spare/repo/netdev-2.6/ branch 'orinoco' 2005-06-27 00:27:47 -04:00
Jeff Garzik
1a9fe638eb wireless/orinoco: remove changelog, bump version 2005-06-27 00:27:07 -04:00
Christoph Hellwig
98c4cae1da [PATCH] orinoco: monitor mode support
Patch from Pavel Roskin
2005-06-27 00:23:55 -04:00
Christoph Hellwig
8f2abf4430 [PATCH] orinoco: always use 802.11 header for rx processing
If the frame has ToDS flag set, mark it by setting skb->pkt_type to
PACKET_OTHERHOST, so that applications unaware of promiscous mode won't get
uplink (STA->AP) packets for STA->STA transmissions relayed by the AP.
Thanks to John Denker and David Gibson for finding the problem and the
solution.

Patch from Pavel Roskin
2005-06-27 00:23:55 -04:00
Christoph Hellwig
95dd91fbd8 [PATCH] orinoco: scanning support
Patch from Pavel Roskin
2005-06-27 00:23:55 -04:00
Christoph Hellwig
16739b065f [PATCH] orinoco: manual roaming for Symbol and Intersilfirmware
Patch from Pavel Roskin
2005-06-27 00:23:55 -04:00
Christoph Hellwig
1fab2e8b7a [PATCH] orinoco: basic ethtool support
I completely reimplemented this based on ethtool_ops, CVS has an
ioctl-based version.
2005-06-27 00:23:55 -04:00
Christoph Hellwig
620554e406 [PATCH] orinoco: wireless API 15 support
(patch from Moustafa Youssef, updated by Jim Carter and Pavel Roskin).
2005-06-27 00:23:54 -04:00
Christoph Hellwig
5d558b7f36 [PATCH] orinoco: include <net/ieee80211.h>
We need constants from this header in the next patches.
2005-06-27 00:23:54 -04:00
Domen Puncer
62595eb906 [PATCH] wireless: char* -> char[] conversion in airo.c
This conversion makes code from line 7101 right:
	if (copy_to_user(com.data, swversion, sizeof(swversion)))

size output (before, after):
  55416    2228     160   57804    e1cc drivers/net/wireless/airo.o
  55412    2228     160   57800    e1c8 drivers/net/wireless/airo.o

more outputs from Alexey Dobriyan:
2.95.3:
           text    data     bss     dec     hex filename
before    51118    2156     160   53434    d0ba drivers/net/wireless/airo.o
after     51118    2156     160   53434    d0ba drivers/net/wireless/airo.o

3.3.5-20050130:
before    46999    2156     160   49315    c0a3 drivers/net/wireless/airo.o
after     46994    2156     160   49310    c09e drivers/net/wireless/airo.o

4.1.0-20050522:
before    45555    2220     160   47935    bb3f drivers/net/wireless/airo.o
after     45550    2220     160   47930    bb3a drivers/net/wireless/airo.o

Signed-off-by: Domen Puncer <domen@coderock.org>
2005-06-26 23:47:57 -04:00
Jeff Garzik
f45727d52d Merge /spare/repo/netdev-2.6/ branch 'ieee80211' 2005-06-26 23:42:30 -04:00
Jeff Garzik
5696c1944a Merge /spare/repo/linux-2.6/ 2005-06-26 23:38:58 -04:00
Pavel Machek
1cc68ae0cf [PATCH] fix int vs. pm_message_t confusion in airo
Fix int vs. pm_message_t confusion in airo. Should change no code.

Signed-off-by: Pavel Machek <pavel@suse.cz>
Cc: Jeff Garzik <jgarzik@pobox.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
2005-06-26 18:37:26 -04:00
Magnus Damm
5ccabb9b45 [PATCH] arlan: module parameter fixes
Make sure the code compiles with and without ARLAN_ENTRY_EXIT_DEBUGGING.
Only provide parameter descriptions when parameters are defined.
Remove "arlan_"-prefix to shape up built-in parameter names:

arlan.arlan_debug -> arlan.debug
arlan.arlan_EEPROM_bad -> arlan.EEPROM_bad
arlan.arlan_entry_and_exit_debug -> arlan.entry_and_exit_debug
arlan.arlan_entry_debug -> arlan.entry_debug
arlan.arlan_exit_debug -> arlan.exit_debug

Signed-off-by: Magnus Damm <damm@opensource.se>
2005-06-26 18:16:13 -04:00
Christoph Lameter
3e1d1d28d9 [PATCH] Cleanup patch for process freezing
1. Establish a simple API for process freezing defined in linux/include/sched.h:

   frozen(process)		Check for frozen process
   freezing(process)		Check if a process is being frozen
   freeze(process)		Tell a process to freeze (go to refrigerator)
   thaw_process(process)	Restart process
   frozen_process(process)	Process is frozen now

2. Remove all references to PF_FREEZE and PF_FROZEN from all
   kernel sources except sched.h

3. Fix numerous locations where try_to_freeze is manually done by a driver

4. Remove the argument that is no longer necessary from two function calls.

5. Some whitespace cleanup

6. Clear potential race in refrigerator (provides an open window of PF_FREEZE
   cleared before setting PF_FROZEN, recalc_sigpending does not check
   PF_FROZEN).

This patch does not address the problem of freeze_processes() violating the rule
that a task may only modify its own flags by setting PF_FREEZE. This is not clean
in an SMP environment. freeze(process) is therefore not SMP safe!

Signed-off-by: Christoph Lameter <christoph@lameter.com>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2005-06-25 17:10:13 -07:00
Alexey Dobriyan
64ccd715d3 [PATCH] Convert users to tty_unregister_ldisc()
tty_register_ldisc(N_FOO, NULL) => tty_unregister_ldisc(N_FOO)

Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2005-06-23 09:45:36 -07:00
4d8e11dcc2 Automatic merge of /spare/repo/netdev-2.6 branch orinoco-hch 2005-06-04 17:05:05 -04:00
4c925f452c Automatic merge of /spare/repo/netdev-2.6 branch we18-ieee80211 2005-05-27 22:57:33 -04:00
Jeff Garzik
66b04a80ee [wireless] ipw2100: fix build after applying SuSE cleanups
s/ieee80211_header_data/ieee80211_hdr_3addr/
2005-05-27 22:53:55 -04:00
51a730d758 Automatic merge of /spare/repo/netdev-2.6 branch we18-ieee80211 2005-05-27 22:08:07 -04:00
ff0e0ea2f5 Automatic merge of /spare/repo/netdev-2.6 branch we18 2005-05-27 22:07:40 -04:00
6cd15a9daf Automatic merge of /spare/repo/netdev-2.6 branch we18-ieee80211 2005-05-27 22:02:58 -04:00
James Ketrenos
43f66a6ce8 Add ipw2200 wireless driver. 2005-05-27 21:59:35 -04:00
James Ketrenos
2c86c27501 Add ipw2100 wireless driver. 2005-05-27 21:57:53 -04:00
ee03a68c10 Automatic merge of /spare/repo/netdev-2.6 branch airo 2005-05-25 22:09:52 -04:00
0c2fc10901 Automatic merge of /spare/repo/netdev-2.6 branch atmel 2005-05-25 22:07:51 -04:00