Commit Graph

75 Commits

Author SHA1 Message Date
Jiri Benc
c4aee8c21f ipw2100: minor cleanups
From: Adrian Bunk <bunk@stusta.de>

This patch contains the following possible cleanups:
- make needlessly global code static
- remove the unused IPW_DEBUG_ENABLED

Signed-off-by: Adrian Bunk <bunk@stusta.de>
Signed-off-by: Jiri Benc <jbenc@suse.cz>
2005-08-25 20:04:43 -04:00
Jiri Benc
797b4f7652 ipw2100: remove custom debug-print macros
From: Pavel Machek <pavel@ucw.cz>

ipw2100 uses custom debug prints that are sometimes longer and always
harder to read than normal printk. They also introduced some bugs where
prefix is printed twice.

Signed-off-by: Pavel Machek <pavel@suse.cz>
Signed-off-by: Jiri Benc <jbenc@suse.cz>
2005-08-25 20:03:27 -04:00
Jiri Benc
19f7f74297 ipw2100: remove strange symbol prefixes
From: Pavel Machek <pavel@ucw.cz>

ipw2100 uses strange X__ prefixes even for symbols already prefixed
by ipw2100. Fixed.

Signed-off-by: Pavel Machek <pavel@suse.cz>
Signed-off-by: Jiri Benc <jbenc@suse.cz>
2005-08-25 20:02:10 -04:00
Jeff Garzik
b2382b363d Merge upstream into ieee80211.
Hand-fix merge conflict in drivers/usb/net/zd1201.c.
2005-08-24 01:02:04 -04:00
Al Viro
ab62c1e1da [PATCH] Kconfig fix (airo_cs on m32r)
airo_cs is broken on m32r; marked as such. [Proper fix would involve
separating PCI-dependent parts and making sure they don't get in the
way _and_ arranging for asm/scatterlist.h getting picked on m32r]

Signed-off-by: Al Viro <viro@parcelfarce.linux.theplanet.co.uk>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2005-08-23 18:43:41 -07:00
Jouni Malinen
2474385e5b [PATCH] ieee80211: Capability field is called ESS, not BSS
IEEE 802.11 has a capability field flag called ESS, but ieee80211 had
renamed this to BSS for some reason. hostap has been using
WLAN_CAPABILITY_ESS and since that matches with the standard, lets use
it as the name for this define. Add WLAN_CAPABILITY_BSS as a backwards
compatibility name for the same bit since ieee80211 and ipw2200 are
using this and there are versions outside kernel tree that expect to
find this define name.

Signed-off-by: Jouni Malinen <jkmaline@cc.hut.fi>
Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
2005-08-15 00:28:17 -04:00
Jeff Garzik
bf79451ec5 [wireless ipw2200] trim trailing whitespace 2005-07-31 13:07:26 -04:00
Jeff Garzik
a670fcb43f /spare/repo/netdev-2.6 branch 'master' 2005-07-30 18:14:15 -04:00
Jar
b2e0743a51 [PATCH] pcmcia: remove duplicates in orinoco_cs
Remove duplicates from the device id table.

Signed-off-by: Jarkko Raja <jar@pcuf.fi>
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-07-28 08:39:00 -07:00
Jesper Juhl
77933d7276 [PATCH] clean up inline static vs static inline
`gcc -W' likes to complain if the static keyword is not at the beginning of
the declaration.  This patch fixes all remaining occurrences of "inline
static" up with "static inline" in the entire kernel tree (140 occurrences in
47 files).

While making this change I came across a few lines with trailing whitespace
that I also fixed up, I have also added or removed a blank line or two here
and there, but there are no functional changes in the patch.

Signed-off-by: Jesper Juhl <juhl-lkml@dif.dk>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2005-07-27 16:26:20 -07:00
Jeff Garzik
327309e899 Merge upstream 2.6.13-rc3 into ieee80211 branch of netdev-2.6. 2005-07-13 16:23:51 -04:00
David S. Miller
b03efcfb21 [NET]: Transform skb_queue_len() binary tests into skb_queue_empty()
This is part of the grand scheme to eliminate the qlen
member of skb_queue_head, and subsequently remove the
'list' member of sk_buff.

Most users of skb_queue_len() want to know if the queue is
empty or not, and that's trivially done with skb_queue_empty()
which doesn't use the skb_queue_head->qlen member and instead
uses the queue list emptyness as the test.

Signed-off-by: David S. Miller <davem@davemloft.net>
2005-07-08 14:57:23 -07:00
Dominik Brodowski
44670d2b50 [PATCH] pcmcia: remove references to pcmcia/version.h
As a follow-up, remove the inclusion of pcmcia/version.h in many files.

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-07-07 18:24:07 -07:00
Dominik Brodowski
1e212f3645 [PATCH] pcmcia: move event handler
Move the "event handler" to struct pcmcia_driver -- the unified event handler
will disappear really soon, but switching it to struct pcmcia_driver in the
meantime allows for better "step-by-step" patches.

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-07-07 18:24:05 -07:00
Jeff Mahoney
5e6557722e [PATCH] openfirmware: generate device table for userspace
This converts the usage of struct of_match to struct of_device_id,
similar to pci_device_id.  This allows a device table to be generated,
which can be parsed by depmod(8) to generate a map file for module
loading.

In order for hotplug to work with macio devices, patches to
module-init-tools and hotplug must be applied.  Those patches are
available at:

 ftp://ftp.suse.com/pub/people/jeffm/linux/macio-hotplug/

Signed-off-by: Jeff Mahoney <jeffm@suse.com>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2005-07-06 12:55:20 -07:00
Jeff Garzik
9bd481f859 wireless: fix ipw warning; add is_broadcast_ether_addr() to linux/etherdevice.h 2005-06-28 01:46:35 -04:00
Jeff Garzik
2179a59db1 Merge /spare/repo/linux-2.6/ 2005-06-28 00:46:46 -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
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
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