Commit Graph

3144 Commits

Author SHA1 Message Date
Jens Osterkamp
054034dbf5 [PATCH] net: fix bonding with spider_net
Another small update for the spidernet driver to fix a bug encountered
during testing our latest hardware with dual-ethernet support.

Signed-off-by: Arnd Bergmann <arndb@de.ibm.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
2005-09-06 22:35:30 -04:00
Jens Osterkamp
543cec517d [PATCH] net: update the spider_net driver
- Prevent PCI posting problems by using synchronous register access
  in critical places

- Check return value from firmware device tree functions

- fix device cleanup

Signed-off-by: Arnd Bergmann <arndb@de.ibm.com>
Cc: Jeff Garzik <jgarzik@pobox.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
2005-09-06 22:35:29 -04:00
Jens Osterkamp
aaec0fab5f [PATCH] net: add driver for the NIC on Cell Blades
This patch adds a driver for a new 1000 Mbit ethernet NIC.  It is
integrated on the south bridge that is used for our Cell Blades.

The code gets the MAC address from the Open Firmware device tree, so it
won't compile on platforms other than ppc64.

This is the first public release, so I don't expect the first version to
get merged, but I'd aim for integration within the 2.6.13 time frame.

Cc: Utz Bacher <utz.bacher@de.ibm.com>
Signed-off-by: Arnd Bergmann <arndb@de.ibm.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
2005-09-06 22:17:49 -04:00
viro@ftp.linux.org.uk
25097d4bda [PATCH] __user annotations (forcedeth.c)
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
2005-09-06 22:17:12 -04:00
Michael Ellerman
269cd3819c [PATCH] iseries_veth: Update copyright notice
My overlords have asked me to update the copyright notice for iseries_veth.

Signed-off-by: Michael Ellerman <michael@ellerman.id.au>
Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
2005-09-06 22:17:12 -04:00
viro@ftp.linux.org.uk
43fece7b8b [PATCH] missed s/u32/pm_message_t/ (dm9000)
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
2005-09-06 22:17:12 -04:00
viro@ftp.linux.org.uk
5ac90037c8 [PATCH] iomem annotations (ac3200.c)
no need to mess with (wrong) casts for ->mem_start, when we have the
original iomem pointer used to set ->mem_start in the first place...

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
2005-09-06 22:17:12 -04:00
Frank Pavlic
8e84c801ba [PATCH] s390: claw driver fixes
[patch 1/4] s390: claw driver fixes

From: Andy Richter <richtera@us.ibm.com>
	- change memory allocation and move dbf from proc to debugfs
	- use dev_kfree_skb_any instead of dev_kfree_skb_irq

Signed-off-by: Frank Pavlic <pavlic@de.ibm.com>

diffstat:
 claw.c |   20 ++++++++++----------
 1 files changed, 10 insertions(+), 10 deletions(-)
Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
2005-09-06 22:15:20 -04:00
ravinandan.arakali@neterion.com
776bd20fa2 [PATCH] S2io: Hardware and miscellaneous fixes
Hi,
This patch contains the following hardware related fixes and other
miscellaneous bug fixes.

1. Updated the definition of single and double-bit ECC errors
2. Earlier we were allocating Transmit descriptors equal to
   MAX_SKB_FRAGS. This was causing a boundary condition failure.
   Need to allocate MAX_SKB_FRAGS+1 descriptors.
3. On some platforms(like PPC), pci_alloc_consistent() can return
   a zero DMA address. Since the NIC cannot handle zero-addresses,
   a workaround has been provided. Basically, we don't use such
   that page. We reallocate.
4. If list_info allocation failed during driver load, check for
   it during driver exit and return instead of trying to dereference
   NULL pointer.
5. Increase the debug level of few non-critical debug messages.
6. Reset the card on critical ECC double errors only in case of
   XframeI since XframeII can recover from such errors.
7. Print copyright message on driver load.
8. Bumped up the driver version no. to 2.0.8.1

Signed-off-by: Ravinandan Arakali <ravinandan.arakali@neterion.com>
Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
2005-09-06 22:12:57 -04:00
Linus Torvalds
5bcaa15579 Merge branch 'upstream' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6 2005-09-06 00:47:18 -07:00
Linus Torvalds
1e231efe50 Merge master.kernel.org:/home/rmk/linux-2.6-arm 2005-09-06 00:45:34 -07:00
Linus Torvalds
ef88b7dba2 Merge master.kernel.org:/pub/scm/linux/kernel/git/sam/kbuild 2005-09-06 00:35:51 -07:00
Linus Torvalds
f65e77693a Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/driver-2.6 2005-09-06 00:32:12 -07:00
Linus Torvalds
8566cfc9fe Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/i2c-2.6 2005-09-06 00:31:02 -07:00
Linus Torvalds
7bdb2b6aca Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6 2005-09-06 00:29:52 -07:00
Al Viro
c0f2f761e1 [SPARC64]: Kconfig fix (GEN_RTC dependencies)
Yet another architecture not coverd by GEN_RTC - sparc64 never picked
it until now and it doesn't have asm/rtc.h to go with it, so it
wouldn't compile anyway (or have these ioctls in the user-visible
headers, for that matter).

FWIW, I'm very tempted to introduce ARCH_HAS_GEN_RTC and have it set
in arch/*/Kconfig for architectures that know what to do with this
stuff - for something supposedly generic the list of architectures
where it doesn't work is getting too long...

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: David S. Miller <davem@davemloft.net>
2005-09-05 23:35:41 -07:00
Al Viro
3d9c994840 [SUNSU]: Compile fixes.
sunsu had been broken by ->stop_tx/->start_tx API changes.

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: David S. Miller <davem@davemloft.net>
2005-09-05 23:35:05 -07:00
David S. Miller
53d0fc27af [RTC]: Use SA_SHIRQ in sparc specific code.
Based upon a report from Jason Wever.

Signed-off-by: David S. Miller <davem@davemloft.net>
2005-09-05 23:33:05 -07:00
Al Viro
1d25240fcf [MOXA]: Fix this driver properly.
Actually, proper fix of that breakage is embarrassingly simple - it's yet
another gratitious leftover include of asm/segment.h, so incremental to the
previos would be removal of that BROKEN and removal of bogus include from
mxser.c itself.

Signed-off-by: David S. Miller <davem@davemloft.net>
2005-09-05 23:30:15 -07:00
David S. Miller
3da54c5b25 [IPW2200]: ipw2200.h needs linux/dma-mapping.h
Signed-off-by: David S. Miller <davem@davemloft.net>
2005-09-05 23:08:01 -07:00
David S. Miller
74da1edf26 [TG3]: Update driver version and release date.
Signed-off-by: David S. Miller <davem@davemloft.net>
2005-09-05 17:56:11 -07:00
Michael Chan
38f3843ed6 [TG3]: Use status tag to check for new events
Use the status tag to determine if there are new events in
tg3_interrupt_tagged(). We discussed about this a while ago with Grant
Grundler and DaveM. This scheme makes it unnecessary to clear the
updated bit in the status block when using tagged mode, and only
a simple comparison is needed to determine if there are new events.

The tp->lock around netif_rx_complete() and tg3_restart_ints() is also
removed. It is unnecessary with DaveM's new locking scheme.

Signed-off-by: Michael Chan <mchan@broadcom.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
2005-09-05 17:53:32 -07:00
Michael Chan
61487480dd [TG3]: Remove status block access in tg3_msi() and add prefetches
Remove unnecessary status block accesses in tg3_msi(). Since MSI is
not shared, it is unnecessary to read the status block to determine if
there are any new events in the MSI handler. It is also unnecessary to
clear the updated bit in the status block.

Since the poll list is per-cpu, tg3_poll() will be scheduled to run on
the same CPU that received the MSI. Prefetches for the status block
and the next rx descriptors are added in tg3_msi() to improve their
access times when tg3_poll() runs.

In the non-MSI irq handlers, we need to check the status block because
interrupts may be shared. Only prefetches for the next rx descriptors
are added.

Signed-off-by: Michael Chan <mchan@broadcom.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
2005-09-05 17:53:19 -07:00
Michael Chan
9f40dead25 [TG3]: Add PHY loopback test
Improve ethtool loopback self test by adding PHY loopback to the
existing MAC loopback test.

Signed-off-by: Michael Chan <mchan@broadcom.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
2005-09-05 17:53:06 -07:00
Michael Chan
4009a93d8e [TG3]: Add ethtool -p support
Signed-off-by: Michael Chan <mchan@broadcom.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
2005-09-05 17:52:54 -07:00
Michael Chan
4c98748763 [TG3]: Minor 5780 and 5752 fixes
Minor SerDes bug fixes for 5780S and nvram bug fixes for 5780 and
5752.

Signed-off-by: Michael Chan <mchan@broadcom.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
2005-09-05 17:52:38 -07:00
James Bottomley
d856f1e337 [PATCH] klist: fix klist to have the same klist_add semantics as list_head
at the moment, the list_head semantics are

list_add(node, head)

whereas current klist semantics are

klist_add(head, node)

This is bound to cause confusion, and since klist is the newcomer, it
should follow the list_head semantics.

I also added missing include guards to klist.h

Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2005-09-05 16:03:13 -07:00
Jesper Juhl
fef6ec8dd9 [PATCH] Driver core: small cleanup; remove check for NULL before kfree() in driver core
Remove needless checking of variable for NULL before calling kfree() on it.
Applies to 2.6.13-rc6-git9

Signed-off-by: Jesper Juhl <jesper.juhl@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2005-09-05 16:03:13 -07:00
Shaohua Li
ceaeade1f9 [PATCH] Driver core: hande sysdev suspend failure
This patch adds the return value check for sysdev suspend and does
restore in failure case. Send the patch to pm-list, but seems lost, so I
resend it.

Signed-off-by: Shaohua Li<shaohua.li@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2005-09-05 16:03:12 -07:00
Andrew Morton
9a8af6b3b6 [PATCH] Floppy: add cmos attribute to floppy driver tidy
Fiddle with coding style a bit.

Cc: Hannes Reinecke <hare@suse.de>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2005-09-05 16:03:11 -07:00
Hannes Reinecke
94fd0db7bf [PATCH] Floppy: Add cmos attribute to floppy driver
Currently only a device 'fdX' shows up in sysfs; the other possible
device for this drive (like fd0h1440 etc) must be guessed from there.

This patch corrects the floppy driver to create a platform device for
each floppy found; each platform device also has an attribute 'cmos'
which represents the cmos type for this drive. From this attribute the
other possible device types can be computed.

From: Hannes Reinecke <hare@suse.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2005-09-05 16:03:10 -07:00
Dmitry Torokhov
76d1ce00bd [PATCH] Driver core: link device and all class devices derived from it.
Driver core: link device and all class devices derived from it.

To ease the task of locating class devices derived from a certain
device create symlinks from parent device to its class devices.
Change USB host class device name from usbX to usb_hostX to avoid
conflict when creating aforementioned links.

Tweaked by Greg to have the symlink be "class_name:class_device_name" in
order to prevent duplicate links.

Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2005-09-05 16:03:10 -07:00
Greg Kroah-Hartman
d65da6eae1 [PATCH] Fix manual binding infinite loop
Fix for manual binding of drivers to devices.  Problem is if you pass in
a valid device id, but the driver refuses to bind.  Infinite loop as
write() tries to resubmit the data it just sent.

Thanks to Michal Ostrowski <mostrows@watson.ibm.com> for pointing the
problem out.

Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2005-09-05 16:03:09 -07:00
Pavel Roskin
3a48c4c2d5 [PATCH] orinoco: New driver - spectrum_cs.
Signed-off-by: Pavel Roskin <proski@gnu.org>

diff-tree dee4f325520d4ea29397dd67ca657b7235bb1790 (from c88faac230cc9775445e5c644991c352e35c72a1)
Author: Pavel Roskin <proski@gnu.org>
Date:   Thu Sep 1 17:46:39 2005 -0400

    New driver - spectrum_cs.

    Driver for 802.11b cards using RAM-loadable Symbol firmware, such as
    Symbol Wireless Networker LA4100, CompactFlash cards by Socket
    Communications and Intel PRO/Wireless 2011B.

    The driver implements Symbol firmware download.  The rest is handled
    in hermes.c and orinoco.c.

    Utilities for downloading the Symbol firmware are available at
    http://sourceforge.net/projects/orinoco/
Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
2005-09-05 18:14:08 -04:00
Pavel Roskin
ec82905177 [PATCH] orinoco: New driver - orinoco_nortel.
Signed-off-by: Pavel Roskin <proski@gnu.org>

diff-tree dce61aef99ceb57370b70222dc34d788666c0ac3 (from ceb6695092be8dcdfe2dec6ee5097d613011489d)
Author: Pavel Roskin <proski@gnu.org>
Date:   Thu Sep 1 15:50:55 2005 -0400

    New driver - orinoco_nortel.

    This is a driver for Nortel emobility PCI adaptors, which consist of an
    Orinoco compatible PCMCIA card and a simple PCI-to-PCMCIA bridge.  The
    driver initializes the device and uses Orinoco core driver for actual
    wireless networking.
Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
2005-09-05 18:14:08 -04:00
Pavel Roskin
8c09e16bd8 [PATCH] orinoco: Remove EXPERIMENTAL mark from PLX_HERMES, TMD_HERMES and PCI_HERMES.
Signed-off-by: Pavel Roskin <proski@gnu.org>

diff-tree ceb6695092be8dcdfe2dec6ee5097d613011489d (from 6b39374a27)
Author: Pavel Roskin <proski@gnu.org>
Date:   Thu Sep 1 14:50:10 2005 -0400

    Remove EXPERIMENTAL mark from PLX_HERMES, TMD_HERMES and PCI_HERMES.

    Those drivers have been used for a long time, and there have been very
    few problem reports.
Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
2005-09-05 18:14:07 -04:00
Pavel Roskin
c89cc225f7 [PATCH] orinoco: Optimize orinoco_join_ap()
Signed-off-by: Pavel Roskin <proski@gnu.org>

diff-tree cb289b9f9b2a0f3ae7070a008f22e383b37526ee (from 56bfcdb38b3d04c1f8c1fd705e411f4be53b663c)
Author: Pavel Roskin <proski@gnu.org>
Date:   Thu Sep 1 19:05:16 2005 -0400

    Optimize orinoco_join_ap() - break from loop once the requested
BSSID
    is found.
Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
2005-09-05 18:14:07 -04:00
Pavel Roskin
708218b064 [PATCH] orinoco: Fix memory leak on error in processing hostscan frames.
Signed-off-by: Pavel Roskin <proski@gnu.org>

diff-tree ca955293cdfd3139e150d3b4fed3922a7eb651fb (from cb289b9f9b2a0f3ae7070a008f22e383b37526ee)
Author: Pavel Roskin <proski@gnu.org>
Date:   Thu Sep 1 19:08:00 2005 -0400

    Fix memory leak on error in processing hostscan frames.
Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
2005-09-05 18:13:44 -04:00
Pavel Roskin
acf73a8563 [PATCH] orinoco: Remove entry for Intel PRO/Wireless 2011B.
Signed-off-by: Pavel Roskin <proski@gnu.org>

diff-tree c88faac230cc9775445e5c644991c352e35c72a1 (from dce61aef99ceb57370b70222dc34d788666c0ac3)
Author: Pavel Roskin <proski@gnu.org>
Date:   Thu Sep 1 17:09:45 2005 -0400

    Remove entry for Intel PRO/Wireless 2011B.

    It is not supported by this driver because it has no firmware in
    flash.  spectrum_cs is needed for this device.
Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
2005-09-05 18:13:44 -04:00
Pavel Roskin
70817c40b9 [PATCH] orinoco: Change orinoco_translate_scan() to return error code on error.
Signed-off-by: Pavel Roskin <proski@gnu.org>

diff-tree 8fc038ec51acf5f777fade80c5e38112b766aeee (from ca955293cdfd3139e150d3b4fed3922a7eb651fb)
Author: Pavel Roskin <proski@gnu.org>
Date:   Thu Sep 1 19:10:12 2005 -0400

    Change orinoco_translate_scan() to return error code on error.
    Adjust the caller to check for errors and clean up if needed.
Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
2005-09-05 18:13:44 -04:00
viro@ZenIV.linux.org.uk
7cda62455c [PATCH] Kconfig fix (PHYLIB vs. s390)
drivers/net/phy/phy.c is broken on s390; it uses enable_irq() and friends
and these do not exist on s390.  Marked as broken for now.

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
2005-09-05 18:12:08 -04:00
Al Viro
9a4822063e [PATCH] (15/22) Kconfig fix (82596)
driver is non-modular

Signed-off-by: Al Viro <viro@parcelfarce.linux.theplanet.co.uk>
Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
2005-09-05 18:10:00 -04:00
Dale Farnsworth
63c9e54914 [PATCH] mv643xx: add netpoll api support
Add support for the netpoll api for use by netconsole, kgdb, etc.

Signed-off-by: Dale Farnsworth <dale@farnsworth.org>
Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
2005-09-05 18:08:30 -04:00
Dale Farnsworth
7342cd810c [PATCH] mv643xx: Fix promiscuous mode handling
mv643xx_eth_get_config_reg() was reading the wrong register.
mv643xx_eth_set_config_reg() was or'ing instead of setting the
register.  These functions are trivial and both are called only from
mv643xx_eth_set_rx_mode() when changing to/from promiscuous mode.
Remove both functions and do the operations directly in
mv643xx_eth_set_rx_mode().

Also, maintain promiscuous mode setting across port resets.

Signed-off-by: Dale Farnsworth <dale@farnsworth.org>
Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
2005-09-05 18:08:30 -04:00
Dale Farnsworth
8f543718ea [PATCH] mv643xx: Disable per port bandwidth limits
The mv643xx chips support per port bandwith limits.  This patch
disables the bandwidth limits by clearing the MTU register.

Signed-off-by: Dale Farnsworth <dale@farnsworth.org>
Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
2005-09-05 18:08:30 -04:00
Dale Farnsworth
b111ceb68a [PATCH] mv643xx: fix outstanding tx skb counter
This patch corrects the accounting of outstanding tx skbs.  It fixes
a bug that causes "Error on Queue Full" messages seen since scatter-gather
was enabled by using the hardware tcp/udp checksum generator.

Signed-off-by: Dale Farnsworth <dale@farnsworth.org>
Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
2005-09-05 18:08:30 -04:00
Dale Farnsworth
b1dd9ca177 [PATCH] mv643xx: fix skb memory leak
This patch fixes an skb memory leak under heavy receive load
(whenever the more packets have been received than the NAPI budget
allows to be processed).

Signed-off-by: Dale Farnsworth <dale@farnsworth.org>
Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
2005-09-05 18:08:30 -04:00
Francois Romieu
e797637f4c [PATCH] sis190: basic sis191 support
The sis191 is the gigabit brother of the sis190. SiS's driver suggests
that the register set is backward compatible: this should hopefully
give a basic driver.

The device should allow the usual features from a modern ethernet
adapter (802.1q, SG, Jumbo frames, TSO, checksum offload). So far
the relevant register layout is not documented. SiS's driver does
not provide these features either (at least not for Linux).

Signed-off-by: Francois Romieu <romieu@fr.zoreil.com>
Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
2005-09-05 18:06:53 -04:00
Francois Romieu
c3d6f1f24c [PATCH] sis190: RGMII Tx internal delay fiddling
Don't ask.
The patch is based on SiS's GPLed driver.

Signed-off-by: Francois Romieu <romieu@fr.zoreil.com>
Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
2005-09-05 18:06:53 -04:00
Francois Romieu
6614a6dc6e [PATCH] sis190: make 10Mbps the default when handling the StationControl register
This patch does three things:
- widen the access to the StationControl register (note the SIS_W16
  versus SIS_W32 change);
- default to 10Mbps half duplex when the LPA can not be evaluated
  (reg31->ctl is identical for both). It can be argued that it makes
  sense as the lowest common denominator when everything else failed.
  Btw it works better than the current code. :o)
- remove some enums: they do not document anymore.

Signed-off-by: Francois Romieu <romieu@fr.zoreil.com>
Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
2005-09-05 18:06:53 -04:00