Commit Graph

71 Commits

Author SHA1 Message Date
Linus Torvalds
d779188d2b Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6 2006-01-04 16:31:56 -08:00
Stephen Hemminger
3c19065a1e [IEEE80211] ipw2200: Simplify multicast checks.
From: Stephen Hemminger <shemminger@osdl.org>

is_multicast_ether_addr() accepts broadcast too, so the
is_broadcast_ether_addr() calls are redundant.

Signed-off-by: David S. Miller <davem@davemloft.net>
2006-01-03 15:27:38 -08:00
Brice Goglin
0f52bf9058 [PATCH] Duplicate IPW_DEBUG option for ipw2100 and 2200
There are currently two IPW_DEBUG options in drivers/net/wireless/Kconfig
(one for ipw2100 and one for ipw2200).  The attached patch splits it into
IPW2100_DEBUG and IPW2200_DEBUG.

Signed-off-by: Brice Goglin <Brice.Goglin@ens-lyon.org>
Cc: "James P. Ketrenos" <ipw2100-admin@linux.intel.com>
Cc: Jeff Garzik <jgarzik@pobox.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
2005-12-01 04:51:34 -05:00
Takis
c75f4742e2 [PATCH] ipw2200: kzalloc conversion and Kconfig dependency fix
- Use kzalloc for IPW2200
- Fix config dependency for IPW2200

Signed-off-by: Panagiotis Issaris <takis@issaris.org>
Cc: James Ketrenos <jketreno@linux.intel.com>
Cc: Yi Zhu <yi.zhu@intel.com>
Cc: Jeff Garzik <jgarzik@pobox.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
2005-12-01 04:51:34 -05:00
Zhu Yi
3b26b1100e [PATCH] ipw2200: fix error log offset calculation
This fixes a slab corruption issue in the ipw2200 driver: it essentially
multiplied the error log number _twice_ by the size of the error element
entry (once explicitly in the code, and once implicitly as part of the
regular pointer arithmetic).

Cc: Henrik Brix Andersen <brix@gentoo.org>
Cc: Bernard Blackham <bernard@blackham.com.au>
Cc: Zilvinas Valinskas <zilvinas@gemtek.lt>
Cc: Pekka Enberg <penberg@cs.helsinki.fi>
Signed-off-by: Zhu Yi <yi.zhu@intel.com>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
--
2005-11-17 08:32:58 -08:00
Pekka Enberg
efb3442cf1 [PATCH] ipw2200: disallow direct scanning when device is down
The function ipw_request_direct_scan() should bail out when the device
is down.  This fixes a lockup caused by wpa_supplicant triggering
ipw_request_direct_scan() while the driver was in a middle of a reset
due to firmware errors.

Thanks to Zilvinas Valinskas for reporting the bug and helping me
debug it.

Signed-off-by: Pekka Enberg <penberg@cs.helsinki.fi>
Acked-by: Zhu Yi <yi.zhu@intel.com>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2005-11-17 08:32:58 -08:00
Linus Torvalds
a7c243b544 Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6 2005-11-09 08:34:36 -08:00
Olaf Hering
733482e445 [PATCH] changing CONFIG_LOCALVERSION rebuilds too much, for no good reason
This patch removes almost all inclusions of linux/version.h.  The 3
#defines are unused in most of the touched files.

A few drivers use the simple KERNEL_VERSION(a,b,c) macro, which is
unfortunatly in linux/version.h.

There are also lots of #ifdef for long obsolete kernels, this was not
touched.  In a few places, the linux/version.h include was move to where
the LINUX_VERSION_CODE was used.

quilt vi `find * -type f -name "*.[ch]"|xargs grep -El '(UTS_RELEASE|LINUX_VERSION_CODE|KERNEL_VERSION|linux/version.h)'|grep -Ev '(/(boot|coda|drm)/|~$)'`

search pattern:
/UTS_RELEASE\|LINUX_VERSION_CODE\|KERNEL_VERSION\|linux\/\(utsname\|version\).h

Signed-off-by: Olaf Hering <olh@suse.de>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2005-11-09 07:55:57 -08:00
James Ketrenos
cf1b479b69 Update version ipw2200 stamp to 1.0.8 2005-11-07 17:52:15 -06:00
James Ketrenos
81715376de Updated firmware version stamp to 2.4 from 2.3 so it will use the latest firmware.
You can obtain the firmware at http://ipw2200.sf.net/firmware.php

Signed-off-by: James Ketrenos <jketreno@linux.intel.com>
2005-11-07 17:52:13 -06:00
James Ketrenos
286568ab1e Fixed parameter reordering in firmware log routine.
Signed-off-by: James Ketrenos <jketreno@linux.intel.com>
2005-11-07 17:52:10 -06:00
Hong Liu
9d5b880bb8 Fixed problem with not being able to send broadcast packets.
Signed-off-by: James Ketrenos <jketreno@linux.intel.com>
2005-11-07 17:52:07 -06:00
James Ketrenos
035205760e Added channel support for ipw2200 cards identified as 'ZZR'
Signed-off-by: James Ketrenos <jketreno@linux.intel.com>
2005-11-07 17:52:05 -06:00
James Ketrenos
991d1cc596 Removed warning about TKIP not being configured if countermeasures are
configured.

Countermeasures default to being turned off when wpa_supplicant runs,
regardless of if TKIP is being used.  They are only turned on if a TKIP
is running.  The warning we were printing is therefore not needed.

Signed-off-by: James Ketrenos <jketreno@linux.intel.com>
2005-11-07 17:52:02 -06:00
Ben Cahill
e758256104 Fixes missed beacon logic in relation to on-network AP roaming.
Signed-off-by: James Ketrenos <jketreno@linux.intel.com>
2005-11-07 17:52:00 -06:00
James Ketrenos
8935f39e86 Removed legacy WIRELESS_EXT checks from ipw2200.c
Signed-off-by: James Ketrenos <jketreno@linux.intel.com>
2005-11-07 17:51:57 -06:00
Benoit Boissinot
97a78ca968 Fix 'Driver using old /proc/net/wireless support, please fix driver !' message.
Wireless extensions moved the get_wireless_stats handler from being
in net_device into wireless_handler.

Signed-off-by: Benoit Boissinot <benoit.boissinot@ens-lyon.org>
Signed-off-by: James Ketrenos <jketreno@linux.intel.com>
2005-11-07 17:51:54 -06:00
James Ketrenos
9ef539d0d6 Updated driver version stamps for ipw2100 (1.1.3) and ipw2200 (1.0.7)
Signed-off-by: James Ketrenos <jketreno@linux.intel.com>
2005-11-07 17:51:49 -06:00
Hong Liu
e63247269d Fixes WEP firmware error condition.
The problem is caused by the patch in bug455 -- Channel change flood
generates fatal error.

The patch set the DISASSOCIATING status bit after sending the command.
The process was scheduled out when waiting for the command to be sent to
the card. The disassociated notification clears the DISASSOCIATING bit
in the tasklet before the process set the bit.

Move the bit setting code before sending the command now.

Signed-off-by: Hong Liu <hong.liu@intel.com>
Signed-off-by: James Ketrenos <jketreno@linux.intel.com>
2005-11-07 17:51:47 -06:00
Zhu Yi
f4ff497d45 [Fix bug# 771] Too many (8) bytes recieved when using AES/hwcrypto
Signed-off-by: James Ketrenos <jketreno@linux.intel.com>
2005-11-07 17:51:44 -06:00
Hong Liu
29cb843e64 Fixes problem with WEP not working (association succeeds, but no Tx/Rx)
Signed-off-by: James Ketrenos <jketreno@linux.intel.com>
2005-11-07 17:51:41 -06:00
James Ketrenos
fb7ccc9e6d Fixed problem with get_cmd_string not existing if CONFIG_IPW_DEBUG disabled.
Signed-off-by: James Ketrenos <jketreno@linux.intel.com>
2005-11-07 17:51:36 -06:00
Hong Liu
cdd1fa1e10 Card with WEP enabled and using shared-key auth will have firmware
error when it tries to auth to a WPA ap. The patch filters out WPA
networks if the card is not wpa enabled when selecting network to
associate to.

Signed-off-by: Hong Liu <hong.liu@intel.com>
2005-11-07 17:51:34 -06:00
Hong Liu
567deaf6d4 Mixed PTK/GTK CCMP/TKIP support.
Signed-off-by: Hong Liu <hong.liu@intel.com>
2005-11-07 17:51:29 -06:00
Peter Jones
90700fd982 Fixed is_network_packet() to include checking for broadcast packets.
Signed-off-by: James Ketrenos <jketreno@linux.intel.com>
2005-11-07 17:51:25 -06:00
Mike Kershaw
24a47dbd89 Adds radiotap support to ipw2200 in monitor mode..
Signed-off-by: Mike Kershaw <dragorn@kismetwireless.net>
Signed-off-by: James Ketrenos <jketreno@linux.intel.com>
2005-11-07 17:51:22 -06:00
Peter Jones
a4f6bbb305 Make all the places the firmware fails to load showerrors (in decimal,
so you can cross-reference errno.h easily).

Signed-off-by: Peter Jones <pjones@redhat.com>
Signed-off-by: James Ketrenos <jketreno@linux.intel.com>
2005-11-07 17:51:19 -06:00
Zhu Yi
5513579181 [Bug 760] Fix setting WEP key in monitor mode causes IV lost.
Signed-off-by: Zhu Yi <yi.zhu@intel.com>
2005-11-07 17:51:14 -06:00
Hong Liu
7b99659f97 [Bug 455] Fix frequent channel change generates firmware fatal error.
Because of the frequent channel change, it is possible that when we are
try to associate with channel 1 (authenticated but not associated).
Another channel change comes at this time, then the driver will issue
disassociate command to the firmware which will cause the fatal error.

It seems that the association/disassociation procedure should not be
interrupted.

The patch attached adds test on STATUS_ASSOCIATING | STATUS_DISASSOCIATING
in ipw_send_cmd(), when ensures that commands will not be sent to firmware
when we are in these two status.

Signed-off-by: Hong Liu <hong.liu@intel.com>
Signed-off-by: Zhu Yi <yi.zhu@intel.com>
2005-11-07 17:51:11 -06:00
James Ketrenos
a0e04ab360 Added wait_state wakeup on scan completion.
Fixed copyright date in ipw2200.h

Signed-off-by: James Ketrenos <jketreno@linux.intel.com>
2005-11-07 17:51:09 -06:00
James Ketrenos
3b9990cb17 Updated ipw2200 to use the new ieee80211 callbacks
(handle_probe_response, handle_beacon, handle_association_response).

Fixed a problem with ipw_send_cmd() returning non-zero on success.

Signed-off-by: James Ketrenos <jketreno@linux.intel.com>
2005-11-07 17:51:06 -06:00
Liu Hong
1fe0adb431 Migrated some of the channel verification code back into the driver to
keep regulatory consistency in one location.

Signed-off-by: James Ketrenos
2005-11-07 17:51:03 -06:00
James Ketrenos
f6c5cb7c6f Added cmdlog in non-debug systems.
You can now specify via the module parameter 'cmdlog' to allocate a
ring buffer for caching host commands sent to the firmware. They can
then be dumped at any time via the sysfs entry 'cmd_log'

Signed-off-by: James Ketrenos <jketreno@linux.intel.com>
2005-11-07 17:51:00 -06:00
James Ketrenos
9ddf84f6f2 Changed all of the ipw_send_cmd() calls to return any ipw_send_cmd error
codes to the caller and changed ipw_send_cmd itself to print the error
message to the syslog indicating which command failed to be sent.

Signed-off-by: James Ketrenos <jketreno@linux.intel.com>
2005-11-07 17:50:58 -06:00
James Ketrenos
b39860c60b Switched firmware error dumping so that it will capture a log available
via sysfs even if debugging disabled.  When a firmware error is
captured, it will be dumped to the kernel log (if debug enabled) and
captured in memory to be retrieved via sysfs.

If an error has already been captured, subsequent errors will be
dropped.

The existing error can be cleared by writing to the error log entry.

Signed-off-by: James Ketrenos <jketreno@linux.intel.com>
2005-11-07 17:50:55 -06:00
James Ketrenos
e666619e23 Modified ipw_config and STATUS_INIT setting to correct race condition
with request_scan being called before initialized if invoked from
insmod, resulting in no association occurring during boot until iwlist
scan is run.

Signed-off-by: James Ketrenos <jketreno@linux.intel.com>
2005-11-07 17:50:52 -06:00
Zhu Yi
6de9f7f27d Fix firmware error when setting tx_power.
Signed-off-by: Zhu Yi <yi.zhu@intel.com>
2005-11-07 17:50:50 -06:00
Zhu Yi
22501c8ed7 Fix ipw_wx_get_txpow shows wrong disabled value.
Signed-off-by: Zhu Yi <yi.zhu@intel.com>
2005-11-07 17:50:47 -06:00
Zhu Yi
0ece35b557 [Bug 701] Fix a misuse of ieee->mode with ieee->iw_mode.
Signed-off-by: Zhu Yi <yi.zhu@intel.com>
2005-11-07 17:50:45 -06:00
Hong Liu
caeff81b4e Fixes the ad-hoc network WEP key list issue.
If we configure the wep keys after creating the ibss network, the
beacons of this network will not show correctly (it still shows "key
off" in iwlist scan report). This is because we don't update the
beacon info in firmware.

Signed-off-by: Hong Liu <hong.liu@intel.com>
Signed-off-by: Zhu Yi <yi.zhu@intel.com>
2005-11-07 17:50:42 -06:00
Zhu Yi
1fbfea549f [Bug 792] Fix WPA-PSK AES both for -Dipw and -Dwext.
Signed-off-by: Zhu Yi <yi.zhu@intel.com>
2005-11-07 17:50:39 -06:00
Zhu Yi
e402c93741 Disable host fragmentation in open mode since IPW2200/2915 hardware
support hardware fragmentation.

Signed-off-by: Zhu Yi <yi.zhu@intel.com>
2005-11-07 17:50:37 -06:00
Zhu Yi
87b016cb64 Workaround kernel BUG_ON panic caused by unexpected duplicate packets.
Signed-off-by: Zhu Yi <yi.zhu@intel.com>
2005-11-07 17:50:34 -06:00
James Ketrenos
4f36f8088a Added more useful geography encoding so people's experience with
iwconfig matches what their hardware can actually do in regard to
supported channel maps, etc.

Signed-off-by: James Ketrenos <jketreno@linux.intel.com>
2005-11-07 17:50:32 -06:00
James Ketrenos
2b184d5b54 Fixed some compiler issues if CONFIG_IPW2200_QOS is enabled.
Updated a copyright date.

Signed-off-by: James Ketrenos <jketreno@linux.intel.com>
2005-11-07 17:50:29 -06:00
James Ketrenos
227d2dc1f1 Updated to support ieee80211 callback to is_queue_full for 802.11e
support.

Signed-off-by: James Ketrenos <jketreno@linux.intel.com>
2005-11-07 17:50:27 -06:00
Liu Hong
8400a1ceb4 [Bug 637] Set tx power for A band.
It uses the ieee80211-geo info to set the tx power of the a/b/g band.

Signed-off-by: James Ketrenos <jketreno@linux.intel.com>
2005-11-07 17:50:21 -06:00
Zhu Yi
d8bad6df04 [bug 667] Fix the notorious "No space for Tx" bug.
We send SYSTEM_CONFIG command after the TGI_KEY command if hardware
encryption is enabled. It sometimes causes a firmware stall (firmware
doesn't respond to any request) and finally bungs up the Tx send queue.
The solution is to send SYSTEM_CONFIG command in the post association
stage from a workqueue.

Signed-off-by: James Ketrenos <jketreno@linux.intel.com>
2005-11-07 17:50:19 -06:00
Zhu Yi
f57ce7ce9c Fix is_duplicate_packet() bug for fragmentation number setting.
Signed-off-by: James Ketrenos <jketreno@linux.intel.com>
2005-11-07 17:50:16 -06:00
Zhu Yi
a2d73e60bb Fix hardware encryption (both WEP and AES) doesn't work with fragmentation.
Firmware sends received packets with double sized ICV/MIC.

Signed-off-by: James Ketrenos <jketreno@linux.intel.com>
2005-11-07 17:50:14 -06:00