Randy Dunlap [Mon, 3 Oct 2005 15:02:14 +0000 (10:02 -0500)]
Fix implicit nocast warnings in ieee80211 code:
net/ieee80211/ieee80211_tx.c:215:9: warning: implicit cast to nocast type
Signed-off-by: Randy Dunlap <rdunlap@xenotime.net>
Signed-off-by: James Ketrenos <jketreno@linux.intel.com>
Ivo van Doorn [Mon, 3 Oct 2005 14:50:40 +0000 (09:50 -0500)]
This will move the ieee80211_is_ofdm_rate function to the ieee80211.h
header, and I also added the ieee80211_is_cck_rate counterpart.
Various drivers currently create there own version of these functions,
but I guess the ieee80211 stack is the best place to provide such
routines.
Signed-off-by: Ivo van Doorn <IvDoorn@gmail.com>
Signed-off-by: James Ketrenos <jketreno@linux.intel.com>
Michael Wu [Wed, 28 Sep 2005 20:16:46 +0000 (15:16 -0500)]
This patch fixes a typo in ieee80211.h: ieee82011_deauth -> ieee80211_deauth
Signed-off-by: Michael Wu <flamingice@sourmilk.net>
Signed-off-by: James Ketrenos <jketreno@linux.intel.com>
Jeff Garzik [Sat, 24 Sep 2005 08:09:04 +0000 (04:09 -0400)]
[wireless airo] remove needed dma_addr_t obfuscation
Fixes bus address truncation bug for certain configs.
Jeff Garzik [Sat, 24 Sep 2005 08:05:52 +0000 (04:05 -0400)]
Remove WIRELESS_EXT ifdefs from several wireless drivers.
Jean Tourrilhes [Sat, 24 Sep 2005 04:59:01 +0000 (21:59 -0700)]
[PATCH] hostap: Remove iwe_stream_add_event kludge
Now that we are compiling with -fno-strict-aliasing (this is the
kernel default), we can drop the following kludge for
iwe_stream_add_event().
Signed-off-by: Jouni Malinen <jkmaline@cc.hut.fi>
Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
Jean Tourrilhes [Sat, 24 Sep 2005 04:59:00 +0000 (21:59 -0700)]
[PATCH] hostap: Use GFP_ATOMIC to get rid of weird might_sleep issue
This is the trace I got :
Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
Jean Tourrilhes [Sat, 24 Sep 2005 04:58:59 +0000 (21:58 -0700)]
[PATCH] hostap: Add support for WE-19
This patch adds support for WE-19 to the HostAP driver. One of
the major change is the use of an explicit flag to tell if iwstat is
in dBm or not.
Signed-off-by: Jouni Malinen <jkmaline@cc.hut.fi>
Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
Pavel Roskin [Sat, 24 Sep 2005 04:58:58 +0000 (21:58 -0700)]
[PATCH] hostap: Fix pci_driver name for hostap_plx and hostap_pci
hostap_pci and hostap_plx drivers still use PCI driver names
"prism2_pci" and "prism2_plx" respectively. This is unfriendly to
linux-wlan-ng, which uses the same names. So, if e.g. hostap_pci and
prism2_pci are loaded, they will "share" /sys/bus/pci/drivers/prism2_plx
directory.
Change PCI driver names of hostap_pci and hostap_plx to be equal to
their module names.
Signed-off-by: Pavel Roskin <proski@gnu.org>
Signed-off-by: Jouni Malinen <jkmaline@cc.hut.fi>
Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
Jeff Garzik [Sat, 24 Sep 2005 02:58:49 +0000 (22:58 -0400)]
[netdrvr] delete CONFIG_PHYCONTROL
Andy Fleming [Sat, 24 Sep 2005 02:54:21 +0000 (22:54 -0400)]
[netdrvr gianfar] use new phy layer
Signed-off-by: Andy Fleming <afleming@freescale.com>
Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
Pavel Roskin [Fri, 23 Sep 2005 08:18:06 +0000 (04:18 -0400)]
[PATCH] orinoco: Bump version to 0.15rc3.
Signed-off-by: Pavel Roskin <proski@gnu.org>
Bump version to 0.15rc3.
Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
Pavel Roskin [Fri, 23 Sep 2005 08:18:06 +0000 (04:18 -0400)]
[PATCH] orinoco: Read only needed data in __orinoco_ev_txexc().
Signed-off-by: Pavel Roskin <proski@gnu.org>
Read only needed data in __orinoco_ev_txexc().
Don't read the 802.11 header beyond addr1. The rest of the frame is not
used currently.
Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
Pavel Roskin [Fri, 23 Sep 2005 08:18:06 +0000 (04:18 -0400)]
[PATCH] orinoco: Annotate endianess of variables and structure members.
Signed-off-by: Pavel Roskin <proski@gnu.org>
Annotate endianess of variables and structure members.
Don't reuse variables for both host-endian and little-endian data.
Minor comment changes in affected structures.
Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
Pavel Roskin [Fri, 23 Sep 2005 08:18:06 +0000 (04:18 -0400)]
[PATCH] orinoco: Remove unneeded forward declarations.
Signed-off-by: Pavel Roskin <proski@gnu.org>
Remove unneeded forward declarations.
Also reorder struct pcmcia_driver initialization to keep attach and
detach together.
Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
Pavel Roskin [Fri, 23 Sep 2005 08:18:06 +0000 (04:18 -0400)]
[PATCH] orinoco: orinoco_send_wevents() could return without unlocking.
Signed-off-by: Pavel Roskin <proski@gnu.org>
orinoco_send_wevents() could return without unlocking.
Failure to read BSSID from the hardware would cause orinoco_send_wevents() to
return with lock held. Found by sparse.
Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
Pavel Roskin [Fri, 23 Sep 2005 08:18:06 +0000 (04:18 -0400)]
[PATCH] orinoco: Fix memory leak and unneeded unlock in orinoco_join_ap()
Signed-off-by: Pavel Roskin <proski@gnu.org>
Fix memory leak and unneeded unlock in orinoco_join_ap()
If orinoco_lock() fails, the code would still run orinoco_unlock(),
instead of freeing the allocated memory. Found by sparse.
Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
Pavel Roskin [Fri, 23 Sep 2005 08:18:06 +0000 (04:18 -0400)]
[PATCH] orinoco: Make nortel_pci_hw_init() static.
Signed-off-by: Pavel Roskin <proski@gnu.org>
Make nortel_pci_hw_init() static.
Found by sparse.
Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
Pavel Roskin [Fri, 23 Sep 2005 08:18:07 +0000 (04:18 -0400)]
[PATCH] orinoco: Remove inneeded system includes.
Signed-off-by: Pavel Roskin <proski@gnu.org>
Remove inneeded system includes.
Most system includes are not needed. In particular, the hardware
backends don't need anything network related. Some includes have been
moved from local headers to the C files where they are actually used.
Includes that have to be in the local headers are no longer from the C
sources.
Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
Jeff Garzik [Thu, 22 Sep 2005 19:43:14 +0000 (15:43 -0400)]
Merge /spare/repo/linux-2.6/
James Ketrenos [Thu, 22 Sep 2005 19:43:07 +0000 (15:43 -0400)]
ieee80211: update orinoco, wl3501 drivers for latest struct naming
James Ketrenos [Thu, 22 Sep 2005 10:34:15 +0000 (10:34 +0000)]
[PATCH] ieee80211: in-tree driver updates to sync with latest ieee80211 series
Changed crypto method from requiring a struct ieee80211_device reference
to the init handler. Instead we now have a get/set flags method for
each crypto component.
Setting of TKIP countermeasures can now be done via
set_flags(IEEE80211_CRYPTO_TKIP_COUNTERMEASURES)
Signed-off-by: James Ketrenos <jketreno@linux.intel.com>
Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
James Ketrenos [Wed, 21 Sep 2005 16:58:56 +0000 (11:58 -0500)]
[PATCH] ieee80211: added IE comments, reason_code to reason, removed info_element from ieee80211_disassoc
tree
0254e7c97cece038cd11b47a16027c6379e464fe
parent
a84f7713dc87ca1b51c6d53b391087663425a080
author James Ketrenos <jketreno@linux.intel.com>
1126661324 -0500
committer James Ketrenos <jketreno@linux.intel.com>
1127319069 -0500
Updated based on Michael Wu's patch and comments sent to netdev.
Added IE comments to ieee80211_* frame structures.
Changed reason_code to reason (consistency)
Removed info_element from ieee80211_disassoc
Signed-off-by: James Ketrenos <jketreno@linux.intel.com>
Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
James Ketrenos [Wed, 21 Sep 2005 16:58:49 +0000 (11:58 -0500)]
[PATCH] ieee80211: Added handle_deauth() callback, enhanced tkip/ccmp support of varying hw/sw offload
tree
de81b55e78e85997642c651ea677078d0554a14f
parent
c8030da8c159f8b82712172a6748a42523aea83a
author James Ketrenos <jketreno@linux.intel.com>
1127104380 -0500
committer James Ketrenos <jketreno@linux.intel.com>
1127315225 -0500
Added handle_deauth() callback.
Enhanced crypt_{tkip,ccmp} to support varying splits of HW/SW offload.
Changed channel freq to u32 from u16.
Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
James Ketrenos [Wed, 21 Sep 2005 16:58:46 +0000 (11:58 -0500)]
[PATCH] ieee80211: Added subsystem version string and reporting via MODULE_VERSION
tree
c1b50ac5d2d1f9b727c39c6bd86a7872f25a1127
parent
1bb997a3ac7dd1941e02426d2f70bd28993a82b7
author James Ketrenos <jketreno@linux.intel.com>
1126720779 -0500
committer James Ketrenos <jketreno@linux.intel.com>
1127314674 -0500
Added subsystem version string and reporting via MODULE_VERSION and
pritnk during load.
NOTE: This is the version support split out from patch 24/29 of the
prior series.
Signed-off-by: James Ketrenos <jketreno@linux.intel.com>
Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
Kumar Gala [Thu, 22 Sep 2005 04:54:58 +0000 (23:54 -0500)]
[PATCH] ppc32: Fix configuration of PCI IO space on MPC85xx platform
For platforms that don't have PCI IO at 0 the outbound window
registers were not being properly configured.
Signed-off-by: Andrew Klossner <andrew@cesa.opbu.xerox.com>
Signed-off-by: Kumar K. Gala <kumar.gala@freescale.com>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Alan Stern [Thu, 22 Sep 2005 07:49:51 +0000 (00:49 -0700)]
[PATCH] USB: Update Documentation/usb/URB.txt
This patch (as564) updates Documentation/usb/URB.txt, bringing it roughly
up to the current level.
Signed-off-by: Alan Stern <stern@rowland.harvard.edu>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Pete Zaitcev [Thu, 22 Sep 2005 07:49:45 +0000 (00:49 -0700)]
[PATCH] ub: Comment out unconditional stall clear
This code appears to be more trouble than it's worth, considering that
no normal users reload drivers. So, we comment it for now. It is not
removed outright for the benefit of hackers (that is, myself).
Signed-off-by: Pete Zaitcev <zaitcev@yahoo.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
David Hollis [Thu, 22 Sep 2005 07:49:39 +0000 (00:49 -0700)]
[PATCH] USB: Add Novatel CDMA Wireless PC card IDs to airprime
USB: Add device id's for Novatel Wireless CDMA wireless PC card.
The Novatel CDMA card behaves the same as the AirPrime by providing
a USB serial port.
Signed-off-by: David Hollis <dhollis@davehollis.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Matthias Urlichs [Thu, 22 Sep 2005 07:49:33 +0000 (00:49 -0700)]
[PATCH] usb/serial/option.c: Increase input buffer size
The card sometimes sends >2000 bytes in one single chunk. Ouch.
Signed-Off-By: Matthias Urlichs <smurf@smurf.noris.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Kevin Vigor [Thu, 22 Sep 2005 07:49:24 +0000 (00:49 -0700)]
[PATCH] USB: fix pegasus driver
Addresses some small bugs in the pegasus ethernet-over-USB driver.
Specifically, malformed long packets from the adapter could cause a kernel
panic; the interrupt interval calculation was inappropriate for high-speed
devices; the return code from read_mii_word was tested incorrectly; and
failure to unlink outstanding URBs before freeing them could lead to kernel
panics when unloading the driver.
Signed-off-by: Kevin Vigor <kevin@realmsys.com>
Cc: Petko Manolov <petkan@users.sourceforge.net>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
David Brownell [Thu, 22 Sep 2005 07:49:07 +0000 (00:49 -0700)]
[PATCH] USB: sl811-hcd minor fixes
Three minor sl811-hcd fixes:
- Elminate memory leak on one (rare) disable/shutdown path.
- For periodic transfers that don't need to be scheduled, update
urb->start_frame to represent the transfer phase correctly.
- Report the (single) port as removable, by default.
Since no drivers yet use start_frame or that part of the hub descriptor,
only that leak is likely to ever matter.
Signed-off-by: David Brownell <dbrownell@users.sourceforge.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
drivers/usb/host/sl811-hcd.c | 16 ++++++++++++++--
1 file changed, 14 insertions(+), 2 deletions(-)
Richard Purdie [Thu, 22 Sep 2005 07:48:58 +0000 (00:48 -0700)]
[PATCH] USB: fix pxa2xx_udc compile warnings
This patch fixes several types in the PXA25x udc driver and hence fixes
several compiler warnings.
Signed-off-by: Richard Purdie <rpurdie@rpsys.net>
Acked-by: David Brownell <dbrownell@users.sourceforge.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Peter Favrholdt [Thu, 22 Sep 2005 07:48:49 +0000 (00:48 -0700)]
[PATCH] USB: ftdi_sio: allow baud rate to be changed without raising RTS and DTR
I'm using a 2 port USB RS232 dongle to connect to a serial-IR cradle for
a bar code reader). Detecting the baudrate of the serial-IR involves
keeping DTR low while changing baudrate.
This works using normal 16550A serial ports as well as the FTDI driver
version 1.4.0 (Linux 2.6.8) but stopped working with the change to
"ensure RTS and DTR are raised when changing baudrate" introduced in
version 1.4.1 (Linux 2.6.9).
The attached patch fixes this, so RTS and DTR is only raised when
changing baudrate iff the previous baudrate was B0.
Signed-off-by: Peter Favrholdt <pfavr@how.dk>
Signed-off-by: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Matthias Urlichs [Thu, 22 Sep 2005 07:48:40 +0000 (00:48 -0700)]
[PATCH] USB: more device IDs for Option card driver
Added support for HUAWEI E600 and Audiovox AirCard
User reports say that these devices work without driver modification.
Signed-off-by: Matthias Urlichs <smurf@smurf.noris.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Pete Zaitcev [Thu, 22 Sep 2005 07:48:29 +0000 (00:48 -0700)]
[PATCH] ub: fix burning cds
This patch fixes a few problems with ub and cleans up a couple of things:
- Bump UB_MAX_REQ_SG, this allows to burn CDs
- Drop initialization of urb.transfer_flags,
now that URB_UNLINK_ASYNC is gone
- Add forgotten processing of stalls at GetMaxLUN
- Remove a few more P3-tagged printks whose time has come
- Correct comment about ZIP-100
Signed-off-by: Pete Zaitcev <zaitcev@yahoo.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
drivers/block/ub.c | 53 +++++++++++++++++++++++++++--------------------------
1 file changed, 27 insertions(+), 26 deletions(-)
Linda Xie [Thu, 22 Sep 2005 07:48:24 +0000 (00:48 -0700)]
[PATCH] PCI Hotplug: Fix buffer overrun in rpadlpar_sysfs.c
Signed-off-by: Linda Xie <lxie@us.ibm.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Amos Waterland [Thu, 22 Sep 2005 07:48:19 +0000 (00:48 -0700)]
[PATCH] fix drivers/pci/probe.c warning
This function expects an unsigned 32-bit type as its third argument:
static u32 pci_size(u32 base, u32 maxbase, u32 mask)
However, given these definitions:
#define PCI_BASE_ADDRESS_MEM_MASK (~0x0fUL)
#define PCI_ROM_ADDRESS_MASK (~0x7ffUL)
these two calls in drivers/pci/probe.c are problematic for architectures
for which a UL is not equivalent to a u32:
sz = pci_size(l, sz, PCI_BASE_ADDRESS_MEM_MASK);
sz = pci_size(l, sz, PCI_ROM_ADDRESS_MASK);
Hence the below compile warning when building for ARCH=ppc64:
drivers/pci/probe.c: In function `pci_read_bases':
/.../probe.c:168: warning: large integer implicitly truncated to unsigned type
/.../probe.c:218: warning: large integer implicitly truncated to unsigned type
Here is a simple fix.
Signed-off-by: Amos Waterland <apw@us.ibm.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Pekka Enberg [Thu, 22 Sep 2005 07:48:11 +0000 (00:48 -0700)]
[PATCH] PCI: convert kcalloc to kzalloc
This patch converts kcalloc(1, ...) calls to use the new kzalloc() function.
Signed-off-by: Pekka Enberg <penberg@cs.helsinki.fi>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Bjorn Helgaas [Thu, 22 Sep 2005 07:48:02 +0000 (00:48 -0700)]
[PATCH] PCI: remove unused "scratch"
Unused variable.
Signed-off-by: Bjorn Helgaas <bjorn.helgaas@hp.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Greg Kroah-Hartman [Thu, 22 Sep 2005 07:47:46 +0000 (00:47 -0700)]
[PATCH] I2C: remove me from the MAINTAINERS file for i2c
Remove my name from the I2C maintainer, Jean is more than capable of
handling it all now.
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Signed-off-by: Jean Delvare <khali@linux-fr.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Bill Nottingham [Thu, 22 Sep 2005 07:47:36 +0000 (00:47 -0700)]
[PATCH] fix class symlinks in sysfs
The class symlinks in sysfs don't properly handle changing device names.
To demonstrate, rename your network device from eth0 to eth1. Your
pci (or usb, or whatever) device will still have a 'net:eth0' link,
except now it points to /sys/class/net/eth1.
The attached patch makes sure the class symlink name changes when
the class device name changes. It isn't 100% correct, it should be
using sysfs_rename_link. Unfortunately, sysfs_rename_link doesn't exist.
Signed-off-by: Bill Nottingham <notting@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Daniel Ritz [Thu, 22 Sep 2005 07:47:24 +0000 (00:47 -0700)]
[PATCH] driver core: add helper device_is_registered()
add the helper and use it instead of open coding the klist_node_attached() check
(which is a layering violation IMHO)
idea by Alan Stern.
Signed-off-by: Daniel Ritz <daniel.ritz@gmx.ch>
Cc: Alan Stern <stern@rowland.harvard.edu>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Daniel Ritz [Thu, 22 Sep 2005 07:47:11 +0000 (00:47 -0700)]
[PATCH] Driver Core: fis bus rescan devices race
bus_rescan_devices_helper() does not hold the dev->sem when it checks for
!dev->driver(). device_attach() holds the sem, but calls again
device_bind_driver() even when dev->driver is set.
What happens is that a first device_attach() call (module insertion time)
is on the way binding the device to a driver. Another thread calls
bus_rescan_devices(). Now when bus_rescan_devices_helper() checks for
dev->driver it is still NULL 'cos the the prior device_attach() is not yet
finished. But as soon as the first one releases the dev->sem the second
device_attach() tries to rebind the already bound device again.
device_bind_driver() does this blindly which leads to a corrupt
driver->klist_devices list (the device links itself, the head points to the
device). Later a call to device_release_driver() sets dev->driver to NULL
and breaks the link it has to itself on knode_driver. Rmmoding the driver
later calls driver_detach() which leads to an endless loop 'cos the list
head in klist_devices still points to the device. And since dev->driver is
NULL it's stuck with the same device forever. Boom. And rmmod hangs.
Very easy to reproduce with new-style pcmcia and a 16bit card. Just loop
modprobe <pcmcia-modules> ;cardctl eject; rmmod <card driver, pcmcia
modules>.
Easiest fix is to check if the device is already bound to a driver in
device_bind_driver(). This avoids the double binding.
Signed-off-by: Daniel Ritz <daniel.ritz@gmx.ch>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Manfred Spraul [Thu, 22 Sep 2005 03:22:10 +0000 (23:22 -0400)]
forcedeth: add hardware tx checksumming
Recent forcedeth nics support checksum offloading for tx.
The attached patch, written by Ayaz Abdulla, adds the support to the
driver.
It also cleans up the handling of the three dma ring entry formats that
are supported by the driver.
Signed-off-By: Manfred Spraul <manfred@colorfullife.com>
Signed-off-By: Jeff Garzik <jgarzik@pobox.com>
James Ketrenos [Wed, 21 Sep 2005 19:33:32 +0000 (14:33 -0500)]
[PATCH] ieee82011: Remove WIRELESS_EXT ifdefs
Remove old WIRELESS_EXT version compatibility
In-tree doesn't need to maintain backward compatibility.
Signed-off-by: James Ketrenos <jketreno@linux.intel.com>
Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
James Ketrenos [Wed, 21 Sep 2005 17:23:51 +0000 (12:23 -0500)]
[PATCH] ieee80211: Updated hostap to be compatible with extra_prefix_len changes
tree
8c1676c8a15c08e6d4c718fc7cd42d9bf4cd8235
parent
0ccc3dd6469ed492578c184f47dde2baccde3593
author James Ketrenos <jketreno@linux.intel.com>
1126715240 -0500
committer James Ketrenos <jketreno@linux.intel.com>
1127316717 -0500
Updated hostap to be compatible with extra_prefix_len changes.
Accomplished via:
for i in hostap_ap.c hostap_80211_tx.c; do
sed -i -e "s:\([.>]\)extra_prefix_len:\1extra_mpdu_prefix_len:g" \
-e "s:\([.>]\)extra_postfix_len:\1extra_mpdu_postfix_len:g" \
drivers/net/wireless/hostap/$i
done
CC: Jouni Malinen <jkmaline@cc.hut.fi>
Signed-off-by: James Ketrenos <jketreno@linux.intel.com>
Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
James Ketrenos [Wed, 21 Sep 2005 17:23:49 +0000 (12:23 -0500)]
[PATCH] ieee80211: Updated hostap to be compatible with ieee80211_hdr changes
tree
8ec97d9056ceaf0f845ed51175dd842b700baadd
parent
329128457008ace3110c96971addf85a767dd5af
author James Ketrenos <jketreno@linux.intel.com>
1126714484 -0500
committer James Ketrenos <jketreno@linux.intel.com>
1127316636 -0500
Updated hostap to be compatible with ieee80211_hdr changes.
Change accomplished via:
for i in hostap_ap.{c,h} hostap_80211_{t,r}x.c; do
sed -i -e "s:ieee80211_hdr\([^_]\):ieee80211_hdr_4addr\1:g" \
drivers/net/wireless/hostap/$i
done
CC: Jouni Malinen <jkmaline@cc.hut.fi>
Signed-off-by: James Ketrenos <jketreno@linux.intel.com>
Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
James Ketrenos [Wed, 21 Sep 2005 16:58:43 +0000 (11:58 -0500)]
[PATCH] ieee80211: Updated copyright dates
tree
0d3e41e574fcb41b9da7f0b7e1d27ec350726654
parent
dbe2885fe2f454d538eaaabefc741ded1026f476
author James Ketrenos <jketreno@linux.intel.com>
1126720499 -0500
committer James Ketrenos <jketreno@linux.intel.com>
1127314531 -0500
Updated copyright dates.
NOTE: This is a split out of just the copyright updates from patch
24/29 in the prior series.
Signed-off-by: James Ketrenos <jketreno@linux.intel.com>
Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
James Ketrenos [Wed, 21 Sep 2005 16:58:38 +0000 (11:58 -0500)]
[PATCH] ieee80211: Keep auth mode unchanged after iwconfig key off/on cycle
tree
2e6f6e7dc4f4eeb8e3dc265020016dd53e40578a
parent
ba2075794a089430b3dd7c90ff46ce1b67e9c7cc
author Zhu Yi <yi.zhu@intel.com>
1125551043 +0800
committer James Ketrenos <jketreno@linux.intel.com>
1127314475 -0500
[Bug 768] Keep auth mode unchanged after iwconfig key off/on cycle.
Signed-off-by: Zhu Yi <yi.zhu@intel.com>
Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
James Ketrenos [Wed, 21 Sep 2005 16:58:32 +0000 (11:58 -0500)]
[PATCH] ieee80211: Mixed PTK/GTK CCMP/TKIP support
tree
5c7559a1216ae1121487f6aed94a6017490729b3
parent
c1ff4c22e5622c8987bf96c09158c4924cde98c2
author Hong Liu <hong.liu@intel.com>
1125482767 +0800
committer James Ketrenos <jketreno@linux.intel.com>
1127314427 -0500
Mixed PTK/GTK CCMP/TKIP support.
Signed-off-by: Hong Liu <hong.liu@intel.com>
Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
James Ketrenos [Wed, 21 Sep 2005 16:58:29 +0000 (11:58 -0500)]
[PATCH] ieee80211: Type-o, capbility definition for QoS, and ERP parsing
tree
3ac0dd07b9972dfd68fee47ec2152d3d378de000
parent
9ada1d971d9829c34a14d98840080b7e69fdff6b
author Mohamed Abbad <mohamed.abbas@intel.com>
1126054379 -0500
committer James Ketrenos <jketreno@linux.intel.com>
1127314340 -0500
Type-o, capbility definition for QoS, and ERP parsing
Added WLAN_CAPABILITY_QOS
Fixed type-o WLAN_CAPABILITY_OSSS_OFDM -> WLAN_CAPABILITY_DSSS_OFDM
Added ERP IE parsing to ieee80211_rx
Added handle_probe_request callback.
Signed-off-by: James Ketrenos <jketreno@linux.intel.com>
Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
James Ketrenos [Wed, 21 Sep 2005 16:58:24 +0000 (11:58 -0500)]
[PATCH] ieee80211: "extern inline" to "static inline"
tree
bce04549ce0a8239d8083d8da5c3d12f7e1aecd9
parent
b15a5153d5f1c75d9435d5ce19b52287059d5d54
author Adrian Bunk <bunk@stusta.de>
1125026386 -0500
committer James Ketrenos <jketreno@linux.intel.com>
1127313953 -0500
"extern inline" doesn't make much sense.
Signed-off-by: Adrian Bunk <bunk@stusta.de>
Signed-off-by: James Ketrenos <jketreno@linux.intel.com>
Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
James Ketrenos [Wed, 21 Sep 2005 16:56:49 +0000 (11:56 -0500)]
[PATCH] ieee80211: Additional fixes for endian-aware types
tree
589bbb92ce7cdf7c2ae820b0ebd3f8fbf1baeee9
parent
c6ce9081e79e8836a11e86e3d38297521a2420be
author Jiri Benc <jbenc@suse.cz>
1125015310 -0400
committer James Ketrenos <jketreno@linux.intel.com>
1127313914 -0500
Additional fixes for endian-aware types
Based on the application of __le16/__be16 changes already made w/ a
prior patch by Michael Wu <flamingice@sourmilk.net>
Signed-off-by: James Ketrenos <jketreno@linux.intel.com>
Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
James Ketrenos [Wed, 21 Sep 2005 16:56:42 +0000 (11:56 -0500)]
[PATCH] ieee80211: Added ieee80211_radiotap.h
tree
383c59b2516a61f2683f02dfebbed0caf6ee5dc3
parent
a04948f63fd96c4b875a43f78afad1a0874cc441
author Mike Kershaw <dragorn@kismetwireless.net>
1124447833 -0500
committer James Ketrenos <jketreno@linux.intel.com>
1127313883 -0500
Added ieee80211_radiotap.h to enhance statistic reporting to user space
from wireless drivers.
Signed-off-by: Mike Kershaw <dragorn@kismetwireless.net>
Signed-off-by: James Ketrenos <jketreno@linux.intel.com>
Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
James Ketrenos [Wed, 21 Sep 2005 16:56:38 +0000 (11:56 -0500)]
[PATCH] ieee80211: Added ieee80211_geo to provide helper functions
tree
385b391fc0d7c124cd0547fdb6183e9a0c333391
parent
97d7a47f76e72bedde7f402785559ed4c7a8e8e8
author James Ketrenos <jketreno@linux.intel.com>
1124447590 -0500
committer James Ketrenos <jketreno@linux.intel.com>
1127313735 -0500
Added ieee80211_geo to provide helper functions to drivers for
implementing supported channel maps.
Signed-off-by: James Ketrenos <jketreno@linux.intel.com>
Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
James Ketrenos [Wed, 21 Sep 2005 16:56:33 +0000 (11:56 -0500)]
[PATCH] ieee80211: Add QoS (WME) support to the ieee80211 subsystem
tree
a3ad796273e98036eb0e9fc063225070fa24508a
parent
1b9c0aeb377abf8e4a43a86cff42382f74ca0259
author Mohamed Abbas <mabbas@linux.intel.com>
1124447069 -0500
committer James Ketrenos <jketreno@linux.intel.com>
1127313435 -0500
Add QoS (WME) support to the ieee80211 subsystem.
NOTE: This requires drivers that use the ieee80211 hard_start_xmit
(ipw2100 and ipw2200) to add the priority parameter to their callback.
Signed-off-by: James Ketrenos <jketreno@linux.intel.com>
Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
James Ketrenos [Wed, 21 Sep 2005 16:56:27 +0000 (11:56 -0500)]
[PATCH] ieee80211: Return NETDEV_TX_BUSY when QoS buffer full
tree
ba6509c7cd1dd4244a2f285f2da5d632e7ffbb25
parent
7b5f9f2ddcabdaea214527a895e6e8445cafdd80
author James Ketrenos <jketreno@linux.intel.com>
1124447000 -0500
committer James Ketrenos <jketreno@linux.intel.com>
1127313383 -0500
Per the conversations with folks at OLS, the QoS layer in 802.11
drivers can now result in NETDEV_TX_BUSY being returned when the queue
a packet is targetted for is full.
To implement this, ieee80211_xmit will now call the driver's
is_queue_full to determine if the current priority queue is full. If
so, NETDEV_TX_BUSY is returned to the kernel and no processing is done
on the frame.
Signed-off-by: James Ketrenos <jketreno@linux.intel.com>
Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
James Ketrenos [Wed, 21 Sep 2005 16:54:53 +0000 (11:54 -0500)]
[PATCH] ieee80211: Fix TKIP, repeated fragmentation problem, and payload_size reporting
tree
8428e9f510e6ad6c77baec89cb57374842abf733
parent
d78bfd3ddae9c422dd350159110f9c4d7cfc50de
author Liu Hong <hong.liu@intel.com>
1124446520 -0500
committer James Ketrenos <jketreno@linux.intel.com>
1127313183 -0500
Fix TKIP, repeated fragmentation problem, and payload_size reporting
1. TKIP encryption
Originally, TKIP encryption issues msdu + mpdu encryption on every
fragment. Change the behavior to msdu encryption on the whole
packet, then mpdu encryption on every fragment.
2. Avoid repeated fragmentation when !host_encrypt.
We only need do fragmentation when using host encryption. Otherwise
we only need pass the whole packet to driver, letting driver do the
fragmentation.
3. change the txb->payload_size to correct value
FW will use this value to determine whether to do fragmentation. If
we pass the wrong value, fw may cut on the wrong bound which will
make decryption fail when we do host encryption.
NOTE: This requires changing drivers (hostap) that have
extra_prefix_len used within them (structure member name change).
Signed-off-by: Hong Liu <liu.hong@intel.com>
Signed-off-by: James Ketrenos <jketreno@linux.intel.com>
Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
James Ketrenos [Wed, 21 Sep 2005 16:54:47 +0000 (11:54 -0500)]
[PATCH] ieee82011: Added ieee80211_tx_frame to convert generic 802.11 data frames, and callbacks
tree
40adc78b623ae70d56074934ec6334eb4f0ae6a5
parent
db43d847bcebaa3df6414e26d0008eb21690e8cf
author James Ketrenos <jketreno@linux.intel.com>
1124445938 -0500
committer James Ketrenos <jketreno@linux.intel.com>
1127313102 -0500
Added ieee80211_tx_frame to convert generic 802.11 data frames into
txbs for transmission.
Added several purpose specific callbacks (handle_assoc, handle_auth,
etc.) which the driver can register with for being notified on
reception of variouf frame elements.
Signed-off-by: James Ketrenos <jketreno@linux.intel.com>
Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
James Ketrenos [Wed, 21 Sep 2005 16:54:43 +0000 (11:54 -0500)]
[PATCH] ieee80211: adds support for the creation of RTS packets
tree
b45c9c1017fd23216bfbe71e441aed9aa297fc84
parent
04aacdd71e904656a304d923bdcf57ad3bd2b254
author Ivo van Doorn <IvDoorn@gmail.com>
1124445405 -0500
committer James Ketrenos <jketreno@linux.intel.com>
1127313029 -0500
This patch adds support for the creation of RTS packets when the
config flag CFG_IEEE80211_RTS has been set.
Signed-Off-By: Ivo van Doorn <IvDoorn@gmail.com>
Signed-off-by: James Ketrenos <jketreno@linux.intel.com>
Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
James Ketrenos [Wed, 21 Sep 2005 16:54:36 +0000 (11:54 -0500)]
[PATCH] ieee80211: Renamed ieee80211_hdr to ieee80211_hdr_3addr
tree
e9c18b2c8e5ad446a4d213243c2dcf9fd1652a7b
parent
4e97ad6ae7084a4f741e94e76c41c68bc7c5a76a
author James Ketrenos <jketreno@linux.intel.com>
1124444315 -0500
committer James Ketrenos <jketreno@linux.intel.com>
1127312922 -0500
Renamed ieee80211_hdr to ieee80211_hdr_3addr and modified ieee80211_hdr
to just contain the frame_ctrl and duration_id.
Changed uses of ieee80211_hdr to ieee80211_hdr_4addr or
ieee80211_hdr_3addr based on what was expected for that portion of code.
NOTE: This requires changes to ipw2100, ipw2200, hostap, and atmel
drivers.
Signed-off-by: James Ketrenos <jketreno@linux.intel.com>
Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
James Ketrenos [Wed, 21 Sep 2005 16:54:30 +0000 (11:54 -0500)]
[PATCH] ieee82011: Added WE-18 support to default wireless extension handler
tree
1536f39c18756698d033da72c49300a561be1289
parent
07172d7c9f10ee3d05d6f6489ba6d6ee2628da06
author Liu Hong <hong.liu@intel.com>
1124436225 -0500
committer James Ketrenos <jketreno@linux.intel.com>
1127312664 -0500
Added WE-18 support to default wireless extension handler in ieee80211
subsystem.
Updated patch since last send to account for ieee80211_device parameter
being added to the crypto init method.
Signed-off-by: James Ketrenos <jketreno@linux.intel.com>
Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
James Ketrenos [Wed, 21 Sep 2005 16:54:22 +0000 (11:54 -0500)]
[PATCH] ieee80211: Allow drivers to fix an issue when using wpa_supplicant with WEP
tree
898fedef6ca1b5b58b8bdf7e6d8894a78bbde4cd
parent
8720fff53090ae428d2159332b6f4b2749dea10f
author Zhu Yi <jketreno@io.(none)>
1124435746 -0500
committer James Ketrenos <jketreno@linux.intel.com>
1127312509 -0500
Allow drivers to fix an issue when using wpa_supplicant with WEP.
The problem is introduced by the hwcrypto patch. We changed indicator of
the encryption request from the upper layer (i.e. wpa_supplicant):
In the original host based crypto the driver could use: crypt &&
crypt->ops.
In the new hardware based crypto, the driver should use the flags
specified in ieee->sec.encrypt.
Signed-off-by: James Ketrenos <jketreno@linux.intel.com>
Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
James Ketrenos [Wed, 21 Sep 2005 16:54:15 +0000 (11:54 -0500)]
[PATCH] ieee80211: Fix kernel Oops when module unload
tree
b69e983266840983183a00f5ac02c66d5270ca47
parent
cdd6372949b76694622ed74fe36e1dd17a92eb71
author Zhu Yi <jketreno@io.(none)>
1124435425 -0500
committer James Ketrenos <jketreno@linux.intel.com>
1127312421 -0500
Fix kernel Oops when module unload.
Export a new function ieee80211_crypt_quiescing from ieee80211. Device
drivers call it to make the host crypto stack enter the quiescence
state, which means "process existing requests, but don't accept new
ones". This is usually called during a driver's host crypto data
structure free (module unload) path.
Signed-off-by: James Ketrenos <jketreno@linux.intel.com>
Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
James Ketrenos [Wed, 21 Sep 2005 16:54:07 +0000 (11:54 -0500)]
[PATCH] ieee80211: Fix time calculation, switching to use jiffies_to_msecs
tree
b9cdd7058b787807655ea6f125e2adbf8d26c863
parent
85d9b2bddfcf3ed2eb4d061947c25c6a832891ab
author Zhu Yi <jketreno@io.(none)>
1124435212 -0500
committer James Ketrenos <jketreno@linux.intel.com>
1127312152 -0500
Fix time calculation, switching to use jiffies_to_msecs.
Signed-off-by: James Ketrenos <jketreno@linux.intel.com>
Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
James Ketrenos [Wed, 21 Sep 2005 16:53:54 +0000 (11:53 -0500)]
[PATCH] ieee80211: Hardware crypto and fragmentation offload support
tree
5322d496af90d03ffbec27292dc1a6268a746ede
parent
6c9364386ccb786e4a84427ab3ad712f0b7b8904
author James Ketrenos <jketreno@linux.intel.com>
1124432367 -0500
committer James Ketrenos <jketreno@linux.intel.com>
1127311810 -0500
Hardware crypto and fragmentation offload support added (Zhu Yi)
Signed-off-by: James Ketrenos <jketreno@linux.intel.com>
Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
James Ketrenos [Wed, 21 Sep 2005 16:53:43 +0000 (11:53 -0500)]
[PATCH] ieee80211: Fixed a kernel oops on module unload
tree
367069f24fc38b4aa910e86ff40094d2078d8aa7
parent
a33a1982012e9070736e3717231714dc9892303b
author James Ketrenos <jketreno@linux.intel.com>
1124430800 -0500
committer James Ketrenos <jketreno@linux.intel.com>
1127310571 -0500
Fixed a kernel oops on module unload by adding spin lock protection to
ieee80211's crypt handlers (thanks to Zhu Yi)
Modified scan result logic to report WPA and RSN IEs if set (vs.being
based on wpa_enabled)
Added ieee80211_device as the first parameter to the crypt init()
method. TKIP modified to use that structure for determining whether to
countermeasures are active.
Signed-off-by: James Ketrenos <jketreno@linux.intel.com>
Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
James Ketrenos [Wed, 21 Sep 2005 17:23:46 +0000 (12:23 -0500)]
[PATCH] ieee80211: Updated atmel to be compatible with ieee80211_hdr changes
tree
d7be83000b058b14450d76f99c432b1fb2a1c177
parent
322201093e03830fceedfc24931420b1ea855a8c
author James Ketrenos <jketreno@linux.intel.com>
1127316330 -0500
committer James Ketrenos <jketreno@linux.intel.com>
1127316330 -0500
Updated atmel to be compatible with ieee80211_hdr changes.
Change accomplished via:
sed -i -e "s:ieee80211_hdr\([^_]\):ieee80211_hdr_4addr\1:g" \
drivers/net/wireless/atmel.c
Compile tested only.
CC: simon@thekelleys.org.uk
Signed-off-by: James Ketrenos <jketreno@linux.intel.com>
Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
James Ketrenos [Wed, 21 Sep 2005 17:23:43 +0000 (12:23 -0500)]
[PATCH] ieee80211: Updated ipw2200 to be compatible with ieee80211's hard_start_xmit change.
tree
713b6ff3311decfe42d5209f7b2508736d144b85
parent
6465beff0e89779330450dffc2a5e6dc5154eebf
author James Ketrenos <jketreno@linux.intel.com>
1126716726 -0500
committer James Ketrenos <jketreno@linux.intel.com>
1127316162 -0500
Updated ipw2200 to be compatible with ieee80211's hard_start_xmit change.
Signed-off-by: James Ketrenos <jketreno@linux.intel.com>
Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
James Ketrenos [Wed, 21 Sep 2005 17:23:41 +0000 (12:23 -0500)]
[PATCH] ieee80211: Updated ipw2200 to be compatible with ieee80211_hdr changes
tree
9f86c7b4f59249c05c96c360dfaa817995e8a44f
parent
9b09701b2c6254f2fddb009004a14eb5a908714f
author James Ketrenos <jketreno@linux.intel.com>
1126714305 -0500
committer James Ketrenos <jketreno@linux.intel.com>
1127316074 -0500
Updated ipw2200 to be compatible with ieee80211_hdr changes.
Signed-off-by: James Ketrenos <jketreno@linux.intel.com>
Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
James Ketrenos [Wed, 21 Sep 2005 17:23:37 +0000 (12:23 -0500)]
[PATCH] ieee80211: Updated ipw2100 to be compatible with ieee80211's hard_start_xmit change
tree
ee48cbe413b795d6be454b9baf4f3bd3d74814cb
parent
49856b147763bd6847e0d8f53aee1ddd61385638
author James Ketrenos <jketreno@linux.intel.com>
1126716634 -0500
committer James Ketrenos <jketreno@linux.intel.com>
1127316024 -0500
Updated ipw2100 to be compatible with ieee80211's hard_start_xmit change.
Signed-off-by: James Ketrenos <jketreno@linux.intel.com>
Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
James Ketrenos [Wed, 21 Sep 2005 17:23:25 +0000 (12:23 -0500)]
[PATCH] ieee80211: Updated ipw2100 to be compatible with ieee80211_hdr changes
tree
992b203395c50342f1cced415acae6177344e270
parent
c59bb604a2ff4e40232ff0422e7adc44e3b007a0
author James Ketrenos <jketreno@linux.intel.com>
1126714006 -0500
committer James Ketrenos <jketreno@linux.intel.com>
1127315910 -0500
Updated ipw2100 to be compatible with ieee80211_hdr changes.
Signed-off-by: James Ketrenos <jketreno@linux.intel.com>
Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
Tommy Christensen [Wed, 21 Sep 2005 19:13:57 +0000 (12:13 -0700)]
[PATCH] r8169: call proper VLAN receive function
vlan_hwaccel_rx should be used when in interrupt context.
Fixes bug http://bugzilla.kernel.org/show_bug.cgi?id=5284
Signed-off-by: Tommy S. Christensen <tommy.christensen@tpack.net>
Cc: Francois Romieu <romieu@fr.zoreil.com>
Cc: Jeff Garzik <jgarzik@pobox.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
Jeff Garzik [Thu, 22 Sep 2005 02:34:08 +0000 (22:34 -0400)]
Merge /spare/repo/linux-2.6/
Stephen Hemminger [Mon, 19 Sep 2005 22:37:16 +0000 (15:37 -0700)]
[PATCH] skge: check length from PHY
Cleanup receive buffer allocation and management,
Add more error handling checks from PHY and bump version.
Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
Stephen Hemminger [Mon, 19 Sep 2005 22:37:34 +0000 (15:37 -0700)]
[PATCH] skge: expand ethtool debug register dump
Expand the returned data for ethtool debug access to include
all of the mapped PCI area; except for the small set of registers
that are for diagnostic RAM access. Access to those registers
will hang the system.
Signed-off-by: Stephen Hemminger <shemminger@osdl.org>
Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
nsxfreddy@gmail.com [Wed, 21 Sep 2005 19:18:04 +0000 (14:18 -0500)]
[PATCH] bonding: Fix link monitor capability check (was skge: set mac address oops with bonding)
Fix bond_enslave link monitoring warning to check use_carrier status
and ethtool_ops in addition to do_ioctl. This version checks ethtool_ops
as well as do_ioctl, and also uses the per-bond params.use_carrier
instead of the global use_carrier.
Signed-off-by: Jason R. Martin <nsxfreddy@gmail.com>
Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
Paolo 'Blaisorblade' Giarrusso [Wed, 21 Sep 2005 16:40:49 +0000 (18:40 +0200)]
[PATCH] uml: fix compile warning after consolidation patch
The header declaring this function wasn't included, so the function declaration
was totally bogus wrt. the proto - even if this wasn't going to fail at all.
It was so bad that the compile warning I got was "control reaches end of
non-void function", i.e. missing return. Actually, this has been there for ages,
the consolidation patch just added the warning which was needed to clean it up.
Nice. Really.
Cc: Allan Graves <allan.graves@gmail.com>
Signed-off-by: Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Paolo 'Blaisorblade' Giarrusso [Wed, 21 Sep 2005 16:40:29 +0000 (18:40 +0200)]
[PATCH] uml: comment about cast build fix
Explain why the casting we do to silence this warning is indeed safe.
It is because the field we're casting from, though being 64-bit wide, was filled
with a pointer in first place by ourselves.
Signed-off-by: Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Paolo 'Blaisorblade' Giarrusso [Wed, 21 Sep 2005 16:40:10 +0000 (18:40 +0200)]
[PATCH] uml: readd removed unistd.h inclusion
Readd this header (deleted in
60d339f6fe0831060600c62418b71a62ad26c281). A
warning is spit out here about undeclared getpgrp().
Signed-off-by: Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Paolo 'Blaisorblade' Giarrusso [Wed, 21 Sep 2005 16:39:47 +0000 (18:39 +0200)]
[PATCH] uml: fix bogus HOST_ELF_CLASS symbol name
Even if with a bit of misunderstanding, Al fixed this in commit
95608261dae863bc43292e6fbd946a3abd3aa49f.
Well, the symbol was intended to come from userspace (it exists there on normal
host), but since some hosts may miss that, using the kernel one is just as fine.
However, rename it to be named consistently with the rest.
Actually, he missed converting ELFCLASS32 to coming from kernel headers. For
consistence, add ELFCLASS64 too.
Cc: Al Viro <viro@ZenIV.linux.org.uk>
Signed-off-by: Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Paolo 'Blaisorblade' Giarrusso [Wed, 21 Sep 2005 16:39:32 +0000 (18:39 +0200)]
[PATCH] uml: Fix conflict between libc and ipv6
gcc is now complaining during link on some hosts - fix it as for other things.
Reported by Antoine Martin <antoine@nagafix.co.uk>.
Signed-off-by: Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Paolo 'Blaisorblade' Giarrusso [Wed, 21 Sep 2005 16:39:14 +0000 (18:39 +0200)]
[PATCH] uml: fix uname output on 32-bit binary on 64-bit host
Translate uname output taken from the host if needed.
Signed-off-by: Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Paolo 'Blaisorblade' Giarrusso [Wed, 21 Sep 2005 16:38:57 +0000 (18:38 +0200)]
[PATCH] uml: fix modify_ldt - missing break in switch
I am a lamer :-(. Luckily, Luo Xin performed LTP testing and found this failure.
Btw, the fact that the patch in which I introduced this was merged shows that:
a) I'm really trusted by people
b) sometimes they're wrong about point a).
c) lack of time for reviewers.
CC: Luo Xin <luothing@sina.com>
Signed-off-by: Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Paolo 'Blaisorblade' Giarrusso [Wed, 21 Sep 2005 16:38:33 +0000 (18:38 +0200)]
[PATCH] uml: remove verify_area_{tt,skas}
When removing verify_area, verify_area_{tt,skas} were forgotten.
Signed-off-by: Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Paolo 'Blaisorblade' Giarrusso [Wed, 21 Sep 2005 16:38:09 +0000 (18:38 +0200)]
[PATCH] Remove unused var from asm/futex.h
As recently done by Russell King for ARM, commit
4732efbeb997189d9f9b04708dc26bf8613ed721 introduces a generic asm/futex.h copied
along most arches, which includes a "-ENOSYS support" to be changed if needed.
However, it includes an unused var (taken from the "real" version) which GCC
warns about.
Remove it from all arches having that file version (i.e. same GIT id).
$ git-diff-tree -r HEAD
and
$ git-ls-tree -r HEAD include/|grep
9feff4ce1424bc390608326240be369eb13aa648
may be more interesting than looking at the patch itself, to make sure I've
just copied the arm header to all other archs having the original dummy version
of this file.
Cc: Jakub Jelinek <jakub@redhat.com>
Signed-off-by: Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Paolo 'Blaisorblade' Giarrusso [Wed, 21 Sep 2005 16:37:14 +0000 (18:37 +0200)]
[PATCH] uml: adapt asm/futex.h to our arch
Follow up to
4732efbeb997189d9f9b04708dc26bf8613ed721 - uml must just reuse
as-is the backing architecture support. There is a micro-fixup is needed for the
included file, which won't affect i386 behaviour at all.
I've not tested compilation on x86_64, only on x86, but the code is almost the
same except the culprit test, so everything should be ok on x86_64 too.
Cc: Jakub Jelinek <jakub@redhat.com>
Signed-off-by: Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Linus Torvalds [Wed, 21 Sep 2005 21:30:37 +0000 (14:30 -0700)]
Merge master.kernel.org:/home/rmk/linux-2.6-arm
Catalin Marinas [Wed, 21 Sep 2005 21:14:05 +0000 (22:14 +0100)]
[ARM] 2932/1: Avoid the "noreturn" warning in arch/arm/kernel/traps.c
Patch from Catalin Marinas
This patch prevents the "noreturn function does return" warning in the
__bug() function in arch/arm/kernel/traps.c
Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Linus Torvalds [Wed, 21 Sep 2005 20:21:35 +0000 (13:21 -0700)]
Merge /pub/scm/linux/kernel/git/roland/infiniband
Hal Rosenstock [Wed, 21 Sep 2005 19:33:09 +0000 (12:33 -0700)]
[IB] Fix RMPP receive length calculation
Based on simplification idea from Sean Hefty <sean.hefty@intel.com>
Signed-off-by: Hal Rosenstock <halr@voltaire.com>
Signed-off-by: Roland Dreier <rolandd@cisco.com>
Sean Hefty [Wed, 21 Sep 2005 19:31:26 +0000 (12:31 -0700)]
[IB] Add MAD data field size definitions
Clean up code by using enums instead of hard-coded magic numbers.
Signed-off-by: Sean Hefty <sean.hefty@intel.com>
Signed-off-by: Roland Dreier <rolandd@cisco.com>
Stephane Kardas [Wed, 21 Sep 2005 16:55:45 +0000 (09:55 -0700)]
[PATCH] fat: fix adate
During a forensic analysis on the fat file system, I found than the result for
the last access date on this file system was different between the stat
command and the istat command (package tct-utils).
The istat command display a true date (the right windows date) but the stat
primitive (so stat, find, ls command) displays a wrong date.
Signed-off-by: OGAWA Hirofumi <hirofumi@mail.parknet.co.jp>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Randy Dunlap [Wed, 21 Sep 2005 16:55:44 +0000 (09:55 -0700)]
[PATCH] update URL for HPET spec.
Correct URL for HPET spec.
Signed-off-by: Randy Dunlap <rdunlap@xenotime.net>
Cc: Andi Kleen <ak@muc.de>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Eric Dumazet [Wed, 21 Sep 2005 16:55:43 +0000 (09:55 -0700)]
[PATCH] Adds sys_set_mempolicy() in include/linux/syscalls.h
Signed-off-by: Eric Dumazet <dada1@cosmosbay.com>
Cc: Andi Kleen <ak@suse.de>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Stephen Hemminger [Wed, 21 Sep 2005 16:55:41 +0000 (09:55 -0700)]
[PATCH] skge: add maintainer
Add MAINTAINER record for Andrew ;-)
Signed-off-by: Stephen Hemminger <shemminger@osdl.org>
Cc: Jeff Garzik <jgarzik@pobox.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Christoph Hellwig [Wed, 21 Sep 2005 16:55:40 +0000 (09:55 -0700)]
[PATCH] fixup Documentation/DocBook/kernel-hacking.tmpl
__FUNCTION__ is the prefered kernel idiom, __func__ is not supported by gcc
2.95 (we actually map __FUNCTION__ to __func__ for more recent compilers,
but it should never be used directly)
Signed-off-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Paolo 'Blaisorblade' Giarrusso [Wed, 21 Sep 2005 16:55:39 +0000 (09:55 -0700)]
[PATCH] mm: add a note about partially hardcoded VM_* flags
Hugh made me note this line for permission checking in mprotect():
if ((newflags & ~(newflags >> 4)) & 0xf) {
after figuring out what's that about, I decided it's nasty enough. Btw
Hugh itself didn't like the 0xf.
We can safely change it to VM_READ|VM_WRITE|VM_EXEC because we never change
VM_SHARED, so no need to check that.
Signed-off-by: Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>
Acked-by: Hugh Dickins <hugh@veritas.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Paolo 'Blaisorblade' Giarrusso [Wed, 21 Sep 2005 16:55:38 +0000 (09:55 -0700)]
[PATCH] mm: update stale comment for removal of page->list
Update comment for the 2.6.6-rc1 conversion from page->list and
address_space->{clean,dirty,locked}_pages to radix tree tagging and ->lru.
I've mostly avoided to mention page lists (at least I've shortened the
comment).
Signed-off-by: Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>
Acked-by: Hugh Dickins <hugh@veritas.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>