linux-3.10.git
16 years agoe1000: increase version to 7.1.9-k2
Auke Kok [Tue, 27 Jun 2006 16:08:34 +0000 (09:08 -0700)]
e1000: increase version to 7.1.9-k2

Increment the version to 7.1.9-k2

Signed-off-by: Jesse Brandeburg <jesse.brandeburg@intel.com>
Signed-off-by: Auke Kok <auke-jan.h.kok@intel.com>
16 years agoe1000: add ich8lan device ID's
Auke Kok [Tue, 27 Jun 2006 16:08:30 +0000 (09:08 -0700)]
e1000: add ich8lan device ID's

Add the device ID's of the supported ICH8 LAN devices.

Signed-off-by: Jesse Brandeburg <jesse.brandeburg@intel.com>
Signed-off-by: Auke Kok <auke-jan.h.kok@intel.com>
16 years agoe1000: allow user to disable ich8 lock loss workaround
Auke Kok [Tue, 27 Jun 2006 16:08:26 +0000 (09:08 -0700)]
e1000: allow user to disable ich8 lock loss workaround

The workaround for the ich8 lock loss problem is only needed for
a very small amount of systems. This adds an option for the user
to disable the workaround.

Signed-off-by: Jesse Brandeburg <jesse.brandeburg@intel.com>
Signed-off-by: Auke Kok <auke-jan.h.kok@intel.com>
16 years agoe1000: integrate ich8 support into driver
Auke Kok [Tue, 27 Jun 2006 16:08:22 +0000 (09:08 -0700)]
e1000: integrate ich8 support into driver

This hooks up the ich8 structure into the driver itself.

Signed-off-by: Jesse Brandeburg <jesse.brandeburg@intel.com>
Signed-off-by: Auke Kok <auke-jan.h.kok@intel.com>
16 years agoe1000: add ich8lan core functions
Auke Kok [Tue, 27 Jun 2006 16:08:17 +0000 (09:08 -0700)]
e1000: add ich8lan core functions

This implements the core new functions needed for ich8's internal
NIC. This includes:

* ich8 specific read/write code
* flash/nvm access code
* software semaphore flag functions
* 10/100 PHY (fe - no gigabit speed) support for low-end versions
* A workaround for a powerdown sequence problem discovered that
affects a small number of motherboard.

Signed-off-by: Jesse Brandeburg <jesse.brandeburg@intel.com>
Signed-off-by: Auke Kok <auke-jan.h.kok@intel.com>
16 years agoe1000: disable ERT
Auke Kok [Tue, 27 Jun 2006 16:08:13 +0000 (09:08 -0700)]
e1000: disable ERT

Hardware is reported to have problems with ERT. We disable it for
all hardware to make sure we are not seeing unexplainable user
problems.

Signed-off-by: Jesse Brandeburg <jesse.brandeburg@intel.com>
Signed-off-by: Auke Kok <auke-jan.h.kok@intel.com>
16 years agoe1000: check return value of _get_speed_and_duplex
Auke Kok [Tue, 27 Jun 2006 16:08:09 +0000 (09:08 -0700)]
e1000: check return value of _get_speed_and_duplex

We were not checking the return value of get_speed_and_duplex
properly, whih may contain an error value.

Signed-off-by: Jesse Brandeburg <jesse.brandeburg@intel.com>
Signed-off-by: Auke Kok <auke-jan.h.kok@intel.com>
16 years agoe1000: M88 PHY workaround
Auke Kok [Tue, 27 Jun 2006 16:08:03 +0000 (09:08 -0700)]
e1000: M88 PHY workaround

M88 rev 2 PHY needs a longer downshift to function properly. This adds
a much longer downshift counter for this specific device.

Signed-off-by: Jesse Brandeburg <jesse.brandeburg@intel.com>
Signed-off-by: Auke Kok <auke-jan.h.kok@intel.com>
16 years agoe1000: fix adapter led blinking inconsistency
Auke Kok [Tue, 27 Jun 2006 16:07:56 +0000 (09:07 -0700)]
e1000: fix adapter led blinking inconsistency

Several e1000 adapters were not blinking correctly or inconsistently. This
patch cleans this up and makes them all behave the same as far as possible.

Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Signed-off-by: Auke Kok <auke-jan.h.kok@intel.com>
16 years agoe1000: disable CRC stripping workaround
Auke Kok [Tue, 27 Jun 2006 16:07:50 +0000 (09:07 -0700)]
e1000: disable CRC stripping workaround

CRC stripping is breaking SMBUS-connected BMC's. We disable this
feature to make it work. This fixes related bugs regarding SOL.

Signed-off-by: Jesse Brandeburg <jesse.brandeburg@intel.com>
Signed-off-by: Auke Kok <auke-jan.h.kok@intel.com>
16 years agoe1000: force register write flushes to circumvent broken platforms
Auke Kok [Tue, 27 Jun 2006 16:07:08 +0000 (09:07 -0700)]
e1000: force register write flushes to circumvent broken platforms

A certain AMD64 bridge (8132) has an option to turn on write combining
which breaks our adapter. To circumvent this we need to flush every write.

Signed-off-by: Jesse Brandeburg <jesse.brandeburg@intel.com>
Signed-off-by: Auke Kok <auke-jan.h.kok@intel.com>
16 years agoe1000: rework module param code with uninitialized values
Auke Kok [Tue, 27 Jun 2006 16:06:59 +0000 (09:06 -0700)]
e1000: rework module param code with uninitialized values

We can take uninitialized values into account which minimizes code
and allows us to simplify the parameter checking code greatly.

Signed-off-by: Jesse Brandeburg <jesse.brandeburg@intel.com>
Signed-off-by: Auke Kok <auke-jan.h.kok@intel.com>
16 years agoe1000: recycle skb
Auke Kok [Tue, 27 Jun 2006 16:06:53 +0000 (09:06 -0700)]
e1000: recycle skb

Recycle an skb to improve performance a bit.

Signed-off-by: Jesse Brandeburg <jesse.brandeburg@intel.com>
Signed-off-by: Auke Kok <auke-jan.h.kok@intel.com>
16 years agoe1000: change printk into DPRINTK
Auke Kok [Tue, 27 Jun 2006 16:06:49 +0000 (09:06 -0700)]
e1000: change printk into DPRINTK

Changing a printk message to make clear that this message is originating
from e1000.

Signed-off-by: Jesse Brandeburg <jesse.brandeburg@intel.com>
Signed-off-by: Auke Kok <auke-jan.h.kok@intel.com>
16 years agoe1000: add smart power down code
Auke Kok [Tue, 27 Jun 2006 16:06:45 +0000 (09:06 -0700)]
e1000: add smart power down code

Smart Power Down is a power saving feature in newer e1000 hardware. We
disable it because it causes time to link to be long, but make it a
user choice.

Signed-off-by: Jesse Brandeburg <jesse.brandeburg@intel.com>
Signed-off-by: Auke Kok <auke-jan.h.kok@intel.com>
16 years agoe1000: small performance tweak by removing double code
Auke Kok [Tue, 27 Jun 2006 16:06:41 +0000 (09:06 -0700)]
e1000: small performance tweak by removing double code

buffer_info is already filled at the end of this while() loop.

Signed-off-by: Jesse Brandeburg <jesse.brandeburg@intel.com>
Signed-off-by: Auke Kok <auke-jan.h.kok@intel.com>
16 years agoe1000: fix CONFIG_PM blocks
Auke Kok [Tue, 27 Jun 2006 16:06:36 +0000 (09:06 -0700)]
e1000: fix CONFIG_PM blocks

e1000_suspend is called even when !CONFIG_PM. The non-PM code inside of it
is properly #ifdef'd. This fixes the compiler warnings when !CONFIG_PM.

Signed-off-by: Jesse Brandeburg <jesse.brandeburg@intel.com>
Signed-off-by: Auke Kok <auke-jan.h.kok@intel.com>
16 years agoe1000: Make PHY powerup/down a function
Auke Kok [Tue, 27 Jun 2006 16:06:32 +0000 (09:06 -0700)]
e1000: Make PHY powerup/down a function

In relation to the irq work done earlier we also move the PHY powerup
and powerdown functions into separate functions and move the calls to
_close and _open, making the PHY stay in it's power state as long as
the device is _up.

Signed-off-by: Jesse Brandeburg <jesse.brandeburg@intel.com>
Signed-off-by: Auke Kok <auke-jan.h.kok@intel.com>
16 years agoe1000: rework driver hardware reset locking
Auke Kok [Tue, 27 Jun 2006 16:06:28 +0000 (09:06 -0700)]
e1000: rework driver hardware reset locking

After studying the driver mac reset code it was found that there
were multiple race conditions possible to reset the unit twice or
bring it e1000_up() double. This fixes all occurences where the
driver needs to reset the mac.

We also remove irq requesting/releasing into _open and _close so
that while the device is _up we will never touch the irq's. This fixes
the double free irq bug that people saw.

To make sure that the watchdog task doesn't cause another race we let
it run as a non-scheduled task.

Signed-off-by: Jesse Brandeburg <jesse.brandeburg@intel.com>
Signed-off-by: Auke Kok <auke-jan.h.kok@intel.com>
16 years agoe1000: fix loopback ethtool test
Auke Kok [Tue, 27 Jun 2006 16:06:24 +0000 (09:06 -0700)]
e1000: fix loopback ethtool test

Ethtool was reporting that loopback failed randomly on esb2
systems. Upon study it was found that the phy manual was changed
with respect to the loopback mode bits. The new value fixes it.

Signed-off-by: Jesse Brandeburg <jesse.brandeburg@intel.com>
Signed-off-by: Auke Kok <auke-jan.h.kok@intel.com>
16 years agoMerge branch 'upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik...
Auke Kok [Wed, 21 Jun 2006 20:43:50 +0000 (13:43 -0700)]
Merge branch 'upstream' of git://git./linux/kernel/git/jgarzik/netdev-2.6

16 years ago[PATCH] s2io: netpoll support
Brian Haley [Thu, 15 Jun 2006 18:36:36 +0000 (14:36 -0400)]
[PATCH] s2io: netpoll support

This adds netpoll support for things like netconsole/kgdboe to the s2io
10GbE driver.

Signed-off-by: Brian Haley <brian.haley@hp.com>
Signed-off-by: Jeff Garzik <jeff@garzik.org>
16 years agoMerge branch 'upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/linville...
Jeff Garzik [Tue, 20 Jun 2006 08:46:02 +0000 (04:46 -0400)]
Merge branch 'upstream' of git://git./linux/kernel/git/linville/wireless-2.6 into upstream

16 years agoMerge branch 'upstream' of git://electric-eye.fr.zoreil.com/home/romieu/linux-2.6...
Jeff Garzik [Tue, 20 Jun 2006 08:43:43 +0000 (04:43 -0400)]
Merge branch 'upstream' of git://electric-eye.fr.zoreil.com/home/romieu/linux-2.6 into upstream

16 years agoMerge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus
Linus Torvalds [Tue, 20 Jun 2006 02:07:12 +0000 (19:07 -0700)]
Merge branch 'upstream' of git://ftp.linux-mips.org/upstream-linus

* 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus: (51 commits)
  [MIPS] Make timer interrupt frequency configurable from kconfig.
  [MIPS] Correct HAL2 Kconfig description
  [MIPS] Fix R4K cache macro names
  [MIPS] Add Missing R4K Cache Macros to IP27 & IP32
  [MIPS] Support for the RM9000-based Basler eXcite smart camera platform.
  [MIPS] Support for the R5500-based NEC EMMA2RH Mark-eins board
  [MIPS] Support SNI RM200C SNI in big endian mode and R5000 processors.
  [MIPS] SN: include asm/sn/types.h for nasid_t.
  [MIPS] Random fixes for sb1250
  [MIPS] Fix bcm1480 compile
  [MIPS] Remove support for NEC DDB5476.
  [MIPS] Remove support for NEC DDB5074.
  [MIPS] Cleanup memory managment initialization.
  [MIPS] SN: Declare bridge_pci_ops.
  [MIPS] Remove unused function alloc_pci_controller.
  [MIPS] IP27: Extract pci_ops into separate file.
  [MIPS] IP27: Use symbolic constants instead of magic numbers.
  [MIPS] vr41xx: remove unnecessay items from vr41xx/Kconfig.
  [MIPS] IP27: Cleanup N/M mode configuration.
  [MIPS] IP27: Throw away old unused hacks.
  ...

16 years agoMerge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland...
Linus Torvalds [Tue, 20 Jun 2006 02:01:59 +0000 (19:01 -0700)]
Merge branch 'for-linus' of git://git./linux/kernel/git/roland/infiniband

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband: (46 commits)
  IB/uverbs: Don't serialize with ib_uverbs_idr_mutex
  IB/mthca: Make all device methods truly reentrant
  IB/mthca: Fix memory leak on modify_qp error paths
  IB/uverbs: Factor out common idr code
  IB/uverbs: Don't decrement usecnt on error paths
  IB/uverbs: Release lock on error path
  IB/cm: Use address handle helpers
  IB/sa: Add ib_init_ah_from_path()
  IB: Add ib_init_ah_from_wc()
  IB/ucm: Get rid of duplicate P_Key parameter
  IB/srp: Factor out common request reset code
  IB/srp: Support SRP rev. 10 targets
  [SCSI] srp.h: Add I/O Class values
  IB/fmr: Use device's max_map_map_per_fmr attribute in FMR pool.
  IB/mthca: Fill in max_map_per_fmr device attribute
  IB/ipath: Add client reregister event generation
  IB/mthca: Add client reregister event generation
  IB: Move struct port_info from ipath to <rdma/ib_smi.h>
  IPoIB: Handle client reregister events
  IB: Add client reregister event type
  ...

16 years agoMerge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Linus Torvalds [Tue, 20 Jun 2006 01:55:56 +0000 (18:55 -0700)]
Merge /pub/scm/linux/kernel/git/davem/net-2.6

* master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6: (109 commits)
  [ETHTOOL]: Fix UFO typo
  [SCTP]: Fix persistent slowdown in sctp when a gap ack consumes rx buffer.
  [SCTP]: Send only 1 window update SACK per message.
  [SCTP]: Don't do CRC32C checksum over loopback.
  [SCTP] Reset rtt_in_progress for the chunk when processing its sack.
  [SCTP]: Reject sctp packets with broadcast addresses.
  [SCTP]: Limit association max_retrans setting in setsockopt.
  [PFKEYV2]: Fix inconsistent typing in struct sadb_x_kmprivate.
  [IPV6]: Sum real space for RTAs.
  [IRDA]: Use put_unaligned() in irlmp_do_discovery().
  [BRIDGE]: Add support for NETIF_F_HW_CSUM devices
  [NET]: Add NETIF_F_GEN_CSUM and NETIF_F_ALL_CSUM
  [TG3]: Convert to non-LLTX
  [TG3]: Remove unnecessary tx_lock
  [TCP]: Add tcp_slow_start_after_idle sysctl.
  [BNX2]: Update version and reldate
  [BNX2]: Use CPU native page size
  [BNX2]: Use compressed firmware
  [BNX2]: Add firmware decompression
  [BNX2]: Allow WoL settings on new 5708 chips
  ...

Manual fixup for conflict in drivers/net/tulip/winbond-840.c

16 years agoMerge branch 'i915fb' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/intelf...
Linus Torvalds [Tue, 20 Jun 2006 01:53:20 +0000 (18:53 -0700)]
Merge branch 'i915fb' of git://git./linux/kernel/git/airlied/intelfb-2.6

* 'i915fb' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/intelfb-2.6: (25 commits)
  intelfb: fixup clock calculation debugging.
  Removed hard coded EDID buffer size.
  intelfb: use regular modedb table instead of VESA
  intelfb: use firmware EDID for mode database
  Revert "intelfb driver -- use the regular modedb table instead of the VESA"
  intelfb: int option fix
  sync modesetting code with X.org
  intelfb: align with changes from my X driver.
  intelfb driver -- use the regular modedb table instead of the VESA
  Adds support for 256MB aperture on 945 chipsets to the intelfb driver
  intelfb -- uses stride alignment of 64 on the 9xx chipsets.
  intelfb: some cleanups for intelfbhw
  intelfb: fixup pitch calculation like X does
  intelfb: fixup p calculation
  This patch makes a needlessly global struct static.
  intelfb: add i945GM support
  intelfb: fixup whitespace..
  intelfb: add hw cursor support for i9xx
  intelfb: make i915 modeset
  intelfb: add support for i945G
  ...

16 years agoMerge master.kernel.org:/pub/scm/linux/kernel/git/davej/agpgart
Linus Torvalds [Tue, 20 Jun 2006 01:51:41 +0000 (18:51 -0700)]
Merge /pub/scm/linux/kernel/git/davej/agpgart

* master.kernel.org:/pub/scm/linux/kernel/git/davej/agpgart:
  [AGPGART] alpha-agp warning fix
  [AGPGART] uninorth-agp warning fixes
  [AGPGART] Remove pointless initialisation in intel-agp
  [AGPGART] Remove pointless code from agp_generic_create_gatt_table()

16 years agoMerge master.kernel.org:/pub/scm/linux/kernel/git/davej/cpufreq
Linus Torvalds [Tue, 20 Jun 2006 01:51:21 +0000 (18:51 -0700)]
Merge /pub/scm/linux/kernel/git/davej/cpufreq

* master.kernel.org:/pub/scm/linux/kernel/git/davej/cpufreq:
  [CPUFREQ] sets nforce2 minimum PLL divider to 2.
  [CPUFREQ] Make powernow-k7 work on SMP kernels.
  [CPUFREQ] cpufreq core {d,}printk adjustments
  [CPUFREQ] dprintk adjustments to cpufreq-speedstep-centrino
  [CPUFREQ] dprintk adjustments to cpufreq-nforce2
  [CPUFREQ] Prepare powernow-k8 for future CPUs.
  [CPUFREQ] Make acpi-cpufreq 'sticky'.
  [CPUFREQ] Remove strange No-op from longrun.c
  [CPUFREQ] Remove more freq_table reinitialisations.
  [CPUFREQ] Fix another redundant initialisation in freq_table
  [CPUFREQ] Remove duplicate assignment in freq_table
  [CPUFREQ] CodingStyle nits in cpufreq_stats.c
  [CPUFREQ] Remove duplicate assignment from cpufreq-nforce2
  [CPUFREQ] Remove pointless reinitialisations in acpi-cpufreq
  [CPUFREQ] Remove pointless reinitialisation from powernow-k8
  [CPUFREQ] Remove redundant initialisation from longhaul.
  [CPUFREQ] Clean up longhaul's speed pretty-printer
  [CPUFREQ] Disambiguate loop indexes in powernow-k7
  [CPUFREQ] Typo in powernow-k8

16 years agoMerge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik...
Linus Torvalds [Tue, 20 Jun 2006 01:50:43 +0000 (18:50 -0700)]
Merge branch 'upstream-linus' of /linux/kernel/git/jgarzik/netdev-2.6

* 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6: (166 commits)
  [PATCH] net: au1000_eth: PHY framework conversion
  [PATCH] 3c5zz ethernet: fix section warnings
  [PATCH] smc ethernet: fix section mismatch warnings
  [PATCH] hp ethernet: fix section mismatches
  [PATCH] Section mismatch in drivers/net/ne.o during modpost
  [PATCH] e1000: prevent statistics from getting garbled during reset
  [PATCH] smc911x Kconfig fix
  [PATCH] forcedeth: new device ids
  [PATCH] forcedeth config: version
  [PATCH] forcedeth config: module parameters
  [PATCH] forcedeth config: diagnostics
  [PATCH] forcedeth config: move functions
  [PATCH] forcedeth config: statistics
  [PATCH] forcedeth config: csum
  [PATCH] forcedeth config: wol
  [PATCH] forcedeth config: phy
  [PATCH] forcedeth config: flow control
  [PATCH] forcedeth config: ring sizes
  [PATCH] forcedeth config: tso cleanup
  [DOC] Update bonding documentation with sysfs info
  ...

16 years agoAdd support for suspending and resuming the whole console subsystem
Linus Torvalds [Tue, 20 Jun 2006 01:16:01 +0000 (18:16 -0700)]
Add support for suspending and resuming the whole console subsystem

Trying to suspend/resume with console messages flying all around is
doomed to failure, when the devices that the messages are trying to
go to are being shut down.

Signed-off-by: Linus Torvalds <torvalds@osdl.org>
16 years agoMake sure to re-enable SCI after an ACPI suspend
Linus Torvalds [Tue, 20 Jun 2006 01:05:09 +0000 (18:05 -0700)]
Make sure to re-enable SCI after an ACPI suspend

According to the ACPI spec, it should be enabled on return from suspend,
but bugs happen.  Apparently especially on the Apple Intel Macs.

Signed-off-by: Linus Torvalds <torvalds@osdl.org>
16 years agoImprove SATA core suspend/resume
Linus Torvalds [Tue, 20 Jun 2006 01:01:27 +0000 (18:01 -0700)]
Improve SATA core suspend/resume

Doing a full ata_busy_sleep() seems to get suspend and resume working
fine on the Apple Mac Mini, at least.

Signed-off-by: Linus Torvalds <torvalds@osdl.org>
16 years ago[MIPS] Make timer interrupt frequency configurable from kconfig.
Atsushi Nemoto [Mon, 19 Jun 2006 15:19:13 +0000 (00:19 +0900)]
[MIPS] Make timer interrupt frequency configurable from kconfig.

Make HZ configurable.  DECSTATION can select 128/256/1024 HZ, JAZZ can
only select 100 HZ, others can select 100/128/250/256/1000/1024 HZ if
not explicitly specified).  Also remove all mach-xxx/param.h files and
update all defconfigs according to current HZ value.

Signed-off-by: Atsushi Nemoto <anemo@mba.ocn.ne.jp>
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
16 years ago[MIPS] Correct HAL2 Kconfig description
Kumba [Sun, 18 Jun 2006 06:17:08 +0000 (02:17 -0400)]
[MIPS] Correct HAL2 Kconfig description

The current HAL2 Kconfig description indicates it is only used on SGI
Indy systems, however all members of the Indigo2 Family have this sound
card as well.  Plus a minor grammatical fix is included.

Signed-off-by: Joshua Kinard <kumba@gentoo.org>
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
16 years ago[MIPS] Fix R4K cache macro names
Kumba [Sun, 18 Jun 2006 06:17:01 +0000 (02:17 -0400)]
[MIPS] Fix R4K cache macro names

Several machines have the R4K cache macro name spelled incorrectly.  Namely,
they have cpu_has_4kcache defined instead of cpu_has_4k_cache.

Signed-off-by: Joshua Kinard <kumba@gentoo.org>
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
16 years ago[MIPS] Add Missing R4K Cache Macros to IP27 & IP32
Kumba [Sun, 18 Jun 2006 06:16:53 +0000 (02:16 -0400)]
[MIPS] Add Missing R4K Cache Macros to IP27 & IP32

Keeping in accordance with other machines, IP27 and IP32 lack a few
macros.  IP27 lacks cpu_has_4kex & cpu_has_4k_cache macros while IP32
lacks just the cpu_has_4k_cache macro.

Signed-off-by: Joshua Kinard <kumba@gentoo.org>
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
16 years ago[MIPS] Support for the RM9000-based Basler eXcite smart camera platform.
Ralf Baechle [Sun, 18 Jun 2006 15:39:46 +0000 (16:39 +0100)]
[MIPS] Support for the RM9000-based Basler eXcite smart camera platform.

Signed-off-by: Thomas Koeller <thomas.koeller@baslerweb.com>
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
16 years ago[MIPS] Support for the R5500-based NEC EMMA2RH Mark-eins board
dmitry pervushin [Sun, 21 May 2006 10:53:06 +0000 (14:53 +0400)]
[MIPS] Support for the R5500-based NEC EMMA2RH Mark-eins board

Signed-off-by: dmitry pervushin <dpervushin@ru.mvista.com>
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
16 years ago[MIPS] Support SNI RM200C SNI in big endian mode and R5000 processors.
Thomas Bogendoerfer [Tue, 13 Jun 2006 11:59:01 +0000 (13:59 +0200)]
[MIPS] Support SNI RM200C SNI in big endian mode and R5000 processors.

Added support for RM200C machines with big endian firmware
Added support for RM200-C40 (R5000 support)

Signed-off-by: Florian Lohoff <flo@rfc822.org>
Signed-off-by: Thomas Bogendoerfer <tsbogend@alpha.franken.de>
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
16 years ago[MIPS] SN: include asm/sn/types.h for nasid_t.
Ralf Baechle [Sat, 17 Jun 2006 09:56:26 +0000 (10:56 +0100)]
[MIPS] SN: include asm/sn/types.h for nasid_t.

Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
16 years ago[MIPS] Random fixes for sb1250
Thiemo Seufer [Sun, 18 Jun 2006 04:23:47 +0000 (05:23 +0100)]
[MIPS] Random fixes for sb1250

Random improvements for sb1250: Silence compiler warnings, a bugfix for
the profiling code, and a comment typo.

Signed-off-by: Thiemo Seufer <ths@networkno.de>
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
16 years ago[MIPS] Fix bcm1480 compile
Thiemo Seufer [Sun, 18 Jun 2006 04:17:54 +0000 (05:17 +0100)]
[MIPS] Fix bcm1480 compile

Fix compilation for bcm1480, a hpt is only available on sb1250/bcm112x.

Signed-off-by: Thiemo Seufer <ths@networkno.de>
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
16 years ago[MIPS] Remove support for NEC DDB5476.
Ralf Baechle [Sun, 18 Jun 2006 04:28:38 +0000 (05:28 +0100)]
[MIPS] Remove support for NEC DDB5476.

As warned several times before.

Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
16 years ago[MIPS] Remove support for NEC DDB5074.
Ralf Baechle [Sun, 18 Jun 2006 03:58:57 +0000 (04:58 +0100)]
[MIPS] Remove support for NEC DDB5074.

As warned several times before.

Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
16 years ago[MIPS] Cleanup memory managment initialization.
Ralf Baechle [Sun, 18 Jun 2006 00:32:22 +0000 (01:32 +0100)]
[MIPS] Cleanup memory managment initialization.

Historically plat_mem_setup did the entire platform initialization.  This
was rather impractical because it meant plat_mem_setup had to get away
without any kind of memory allocator.  To keep old code from breaking
plat_setup was just renamed to plat_setup and a second platform
initialization hook for anything else was introduced.

Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
16 years ago[MIPS] SN: Declare bridge_pci_ops.
Ralf Baechle [Sat, 17 Jun 2006 13:55:40 +0000 (14:55 +0100)]
[MIPS] SN: Declare bridge_pci_ops.

Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
16 years ago[MIPS] Remove unused function alloc_pci_controller.
Ralf Baechle [Sat, 17 Jun 2006 13:54:32 +0000 (14:54 +0100)]
[MIPS] Remove unused function alloc_pci_controller.

Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
16 years ago[MIPS] IP27: Extract pci_ops into separate file.
Ralf Baechle [Fri, 16 Jun 2006 23:55:45 +0000 (00:55 +0100)]
[MIPS] IP27: Extract pci_ops into separate file.

Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
16 years ago[MIPS] IP27: Use symbolic constants instead of magic numbers.
Ralf Baechle [Fri, 16 Jun 2006 23:46:27 +0000 (00:46 +0100)]
[MIPS] IP27: Use symbolic constants instead of magic numbers.

Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
16 years ago[MIPS] vr41xx: remove unnecessay items from vr41xx/Kconfig.
Yoichi Yuasa [Thu, 15 Jun 2006 14:29:37 +0000 (23:29 +0900)]
[MIPS] vr41xx: remove unnecessay items from vr41xx/Kconfig.

Remove unnecessary items from vr41xx/Kconfig.  SYS_HA_CPU_VR41XX has
already been selected by MACH_VR41XX.

Signed-off-by: Yoichi Yuasa <yoichi_yuasa@tripeaks.co.jp>
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
16 years ago[MIPS] IP27: Cleanup N/M mode configuration.
Ralf Baechle [Wed, 14 Jun 2006 07:10:35 +0000 (08:10 +0100)]
[MIPS] IP27: Cleanup N/M mode configuration.

Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
16 years ago[MIPS] IP27: Throw away old unused hacks.
Ralf Baechle [Wed, 14 Jun 2006 07:01:30 +0000 (08:01 +0100)]
[MIPS] IP27: Throw away old unused hacks.

Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
16 years ago[MIPS] Drop 0 definition for kern_addr_valid
Ralf Baechle [Mon, 12 Jun 2006 11:20:09 +0000 (12:20 +0100)]
[MIPS] Drop 0 definition for kern_addr_valid

kern_addr_valid is currently only being used in kmem_ptr_validate which
is making some vague attempt at verfying the validity of an address.
Only IA-64, PARISC and x86-64 actually make some actual effort to verify
the validity of the pointer.  Most architecture definitions of
kern_addr_valid() just define it as 1; the Alpha and CONFIG_DISCONTIGMEM
on i386 and MIPS even as 0; the 0-definition will result in
kmem_ptr_validate always failing which in turn will cause d_validate to
always fail.  d_validate's only two users are smbfs and ncpfs, so the
0 definition ended breaking those ...

Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
16 years ago[MIPS] Consolidate definitions of pfn_valid in one file.
Ralf Baechle [Mon, 12 Jun 2006 08:13:56 +0000 (09:13 +0100)]
[MIPS] Consolidate definitions of pfn_valid in one file.

Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
16 years ago[MIPS] APM emu support
Rodolfo Giometti [Mon, 5 Jun 2006 15:43:10 +0000 (17:43 +0200)]
[MIPS] APM emu support

Signed-off-by: Rodolfo Giometti <giometti@linux.it>
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
16 years ago[MIPS] SN: Rename SGI_SN0_N_MODE -> SGI_SN_N_MODE.
Ralf Baechle [Sun, 11 Jun 2006 23:55:14 +0000 (00:55 +0100)]
[MIPS] SN: Rename SGI_SN0_N_MODE -> SGI_SN_N_MODE.

It's not SN0-specific.

Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
16 years ago[MIPS] SN: Move FRU header one level up; it is not SN0-specific.
Ralf Baechle [Fri, 9 Jun 2006 23:37:20 +0000 (00:37 +0100)]
[MIPS] SN: Move FRU header one level up; it is not SN0-specific.

Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
16 years ago[MIPS] Cleanup ARCH_DISCONTIGMEM_ENABLE and NUMA configuration.
Ralf Baechle [Sun, 11 Jun 2006 22:03:08 +0000 (23:03 +0100)]
[MIPS] Cleanup ARCH_DISCONTIGMEM_ENABLE and NUMA configuration.

IP27 configuration isn't the only NUMA system - it just happens to be
the currently only supported MIPS NUMA system.  So move the necessary
options back into the main MIPS Kconfig file.

Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
16 years ago[MIPS] IP27: Remove #if 0'ed code.
Ralf Baechle [Wed, 7 Jun 2006 19:13:20 +0000 (20:13 +0100)]
[MIPS] IP27: Remove #if 0'ed code.

Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
16 years ago[MIPS] IP27: Nuke leftovers of _STANDALONE
Ralf Baechle [Wed, 7 Jun 2006 19:10:06 +0000 (20:10 +0100)]
[MIPS] IP27: Nuke leftovers of _STANDALONE

Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
16 years ago[MIPS] IP27: Remove leftovers of sable support.
Ralf Baechle [Wed, 7 Jun 2006 19:07:29 +0000 (20:07 +0100)]
[MIPS] IP27: Remove leftovers of sable support.

Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
16 years ago[MIPS] IP27: Nuke last leftovers from FRUTEST
Ralf Baechle [Wed, 7 Jun 2006 19:04:23 +0000 (20:04 +0100)]
[MIPS] IP27: Nuke last leftovers from FRUTEST

Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
16 years ago[MIPS] IP27: Nuke last leftovers of CONFIG_SGI_IO.
Ralf Baechle [Wed, 7 Jun 2006 19:02:21 +0000 (20:02 +0100)]
[MIPS] IP27: Nuke last leftovers of CONFIG_SGI_IO.

Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
16 years ago[MIPS] C99-ify struct resource initialization.
Ralf Baechle [Sun, 4 Jun 2006 22:14:05 +0000 (15:14 -0700)]
[MIPS] C99-ify struct resource initialization.

Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
16 years ago[MIPS] Remove duplicate declarations from Alchemy code.
Ralf Baechle [Sat, 3 Jun 2006 23:55:21 +0000 (00:55 +0100)]
[MIPS] Remove duplicate declarations from Alchemy code.

Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
16 years ago[MIPS] Cleanup __emt() a bit.
Ralf Baechle [Sat, 3 Jun 2006 20:59:51 +0000 (21:59 +0100)]
[MIPS] Cleanup __emt() a bit.

Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
16 years ago[MIPS] Remove unused definitions from addrspace.h.
Yoichi Yuasa [Wed, 31 May 2006 07:00:05 +0000 (16:00 +0900)]
[MIPS] Remove unused definitions from addrspace.h.

Signed-off-by: Yoichi Yuasa <yoichi_yuasa@tripeaks.co.jp>
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
16 years ago[MIPS] arch/mips/au1000/time.c cleanup
Sergei Shtylyov [Sat, 27 May 2006 20:04:01 +0000 (00:04 +0400)]
[MIPS] arch/mips/au1000/time.c cleanup

Mark au1xxx_timer_setup() __init, just because it is. Get rid of
unneeded extern's (note that (*do_gettimeoffset)() is already declared by
<asm/time.c>) and an unused variable. Kill some whitespace...

Signed-off-by: Sergei Shtylyov <sshtylyov@ru.mvista.com>
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
16 years ago[MIPS] Remove unused instances of prom_build_cpu_map.
Ralf Baechle [Thu, 18 May 2006 11:38:47 +0000 (12:38 +0100)]
[MIPS] Remove unused instances of prom_build_cpu_map.

Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
16 years ago[MIPS] Qemu system shutdown support
Thiemo Seufer [Mon, 15 May 2006 17:59:34 +0000 (18:59 +0100)]
[MIPS] Qemu system shutdown support

Signed-off-by: Thiemo Seufer <ths@networkno.de>
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
16 years ago[MIPS] Unify mips_fpu_soft_struct and mips_fpu_hard_structs.
Atsushi Nemoto [Mon, 15 May 2006 16:26:03 +0000 (01:26 +0900)]
[MIPS] Unify mips_fpu_soft_struct and mips_fpu_hard_structs.

The struct mips_fpu_soft_struct and mips_fpu_hard_struct are
completely same now and the kernel fpu emulator assumes that.  This
patch unifies them to mips_fpu_struct and get rid of mips_fpu_union.

Signed-off-by: Atsushi Nemoto <anemo@mba.ocn.ne.jp>
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
16 years ago[MIPS] Remove prototype for non-existing function.
Ralf Baechle [Mon, 15 May 2006 14:08:22 +0000 (15:08 +0100)]
[MIPS] Remove prototype for non-existing function.

Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
16 years ago[MIPS] Wind River 4KC PPMC Eval Board Support
Mark.Zhan [Sat, 6 May 2006 09:04:20 +0000 (17:04 +0800)]
[MIPS] Wind River 4KC PPMC Eval Board Support

Support for the GT-64120-based Wind River 4KC PPMC Evaluation board.

Signed-off-by: Rongkai.Zhan <Rongkai.zhan@windriver.com>
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
16 years ago[MIPS] Au1xxx: board specific irq code cleanup
Herbert Valerio Riedel [Sun, 7 May 2006 13:48:25 +0000 (15:48 +0200)]
[MIPS] Au1xxx: board specific irq code cleanup

Convert sizeof/sizeof use to use of ARRAY_SIZE macro, and annotate
irqmap structures as __initdata.

Signed-off-by: Herbert Valerio Riedel <hvr@gnu.org>
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
16 years ago[MIPS] IP27: Fix collision with hardcoded interrupt number.
Ralf Baechle [Fri, 16 Jun 2006 15:10:49 +0000 (17:10 +0200)]
[MIPS] IP27: Fix collision with hardcoded interrupt number.

Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
16 years ago[MIPS] Fix futex_atomic_op_inuser.
Atsushi Nemoto [Sun, 11 Jun 2006 14:25:43 +0000 (23:25 +0900)]
[MIPS] Fix futex_atomic_op_inuser.

I found that NPTL's pthread_cond_signal() does not work properly on
kernels compiled by gcc 4.1.x.  I suppose inline asm for
__futex_atomic_op() was wrong.  I suppose:

1. "=&r" constraint should be used for oldval.
2. Instead of "r" (uaddr), "=R" (*uaddr) for output and "R" (*uaddr)
   for input should be used.
3. "memory" should be added to the clobber list.

Signed-off-by: Atsushi Nemoto <anemo@mba.ocn.ne.jp>
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
16 years ago[PATCH] Fix BCM1480 doubled process accounting times.
[MIPS] James E Wilson [Mon, 27 Feb 2006 23:04:38 +0000 (15:04 -0800)]
[PATCH] Fix BCM1480 doubled process accounting times.

Running a UP kernel on a bcm1480 board, I get nonsensical timing
results, like this:
release@unknown:~/tmp$ time ./a.out
real    0m22.906s
user    0m45.792s
sys     0m0.010s
According to my watch, this program took 23 seconds to run, so the real
time clock is OK.  It is process accounting that is broken.

I tracked this down to a problem with the function
bcm1480_timer_interrupt in the file sibyte/bcm1480/time.c.  This
function calls ll_timer_interrupt for cpu0, and ll_local_timer_interrupt
for all cpus.  However, both of these functions do process accounting.
Thus processes running on cpu0 end up with doubled times.  This is very
obvious in a UP kernel where all processes run on cpu0.

The correct way to do this is to only call ll_local_timer interrupt if
this is not cpu0.  This can be seen in the mips-board/generic/time.c
file, and also in the sibyte/sb1250/time.c file, both of which handle
this correctly.  I fixed the bcm1480/time.c file by copying over the
correct code from the sb1250/time.c file.

With this fix, I now get sensible results.
release@unknown:~/tmp$ time ./a.out
real    0m22.903s
user    0m22.894s
sys     0m0.006s

Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
16 years ago[MIPS] Mark PNX8550 support broken.
Ralf Baechle [Wed, 7 Jun 2006 14:24:44 +0000 (15:24 +0100)]
[MIPS] Mark PNX8550 support broken.

Broken in too many way for me to fix it for 2.6.17.

Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
16 years ago[MIPS] Fix optimization for size build.
Ralf Baechle [Wed, 7 Jun 2006 12:25:37 +0000 (13:25 +0100)]
[MIPS] Fix optimization for size build.

It took a while longer than on other architectures but gcc has finally
started to strike us as well ...

This also fixes the damage by 6edfba1b33c701108717f4e036320fc39abe1912.

Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
16 years ago[MIPS] IP22: Fix ISA driver builds if CONFIG_EISA is selected.
Ralf Baechle [Wed, 7 Jun 2006 11:53:17 +0000 (12:53 +0100)]
[MIPS] IP22: Fix ISA driver builds if CONFIG_EISA is selected.

Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
16 years ago[MIPS] Cobalt: Fix undefined reference to disable_early_printk.
Yoichi Yuasa [Wed, 7 Jun 2006 00:53:34 +0000 (09:53 +0900)]
[MIPS] Cobalt: Fix undefined reference to disable_early_printk.

Signed-off-by: Yoichi Yuasa <yoichi_yuasa@tripeaks.co.jp>
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
16 years ago[MIPS] Fix fpu_save_double on 64-bit.
Atsushi Nemoto [Mon, 22 May 2006 15:47:41 +0000 (00:47 +0900)]
[MIPS] Fix fpu_save_double on 64-bit.

> Without this fix, _save_fp() in 64-bit kernel is seriously broken.
>
ffffffff8010bec0 <_save_fp>:
ffffffff8010bec0:       400d6000        mfc0    t1,c0_status
ffffffff8010bec4:       000c7140        sll     t2,t0,0x5
ffffffff8010bec8:       05c10011        bgez    t2,ffffffff8010bf10 <_save_fp+0x50>
ffffffff8010becc:       00000000        nop
ffffffff8010bed0:       f4810328        sdc1    $f1,808(a0)
> ...

Fix register usage in fpu_save_double() and make fpu_restore_double()
more symmetric with fpu_save_double().

Signed-off-by: Atsushi Nemoto <anemo@mba.ocn.ne.jp>
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
16 years ago[MIPS] Malta: Handle byteswapping hardare bug in big endian mode.
Elizabeth Oldham [Tue, 6 Jun 2006 09:57:09 +0000 (10:57 +0100)]
[MIPS] Malta: Handle byteswapping hardare bug in big endian mode.

The SOC-it system controller running in big endian mode might forget
byteswapping when DMAing to the last word of physical memory.  Fixed by
ignoring the last page of memory.

Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
16 years agointelfb: fixup clock calculation debugging.
Dave Airlie [Sun, 18 Jun 2006 06:12:27 +0000 (16:12 +1000)]
intelfb: fixup clock calculation debugging.

The debugging code for pll clocks was wrong and causing div by 0.

Signed-off-by: Dave Airlie <airlied@linux.ie>
16 years ago[ETHTOOL]: Fix UFO typo
Herbert Xu [Sun, 18 Jun 2006 06:00:20 +0000 (23:00 -0700)]
[ETHTOOL]: Fix UFO typo

The function ethtool_get_ufo was referring to ETHTOOL_GTSO instead of
ETHTOOL_GUFO.

Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: David S. Miller <davem@davemloft.net>
16 years ago[SCTP]: Fix persistent slowdown in sctp when a gap ack consumes rx buffer.
Neil Horman [Sun, 18 Jun 2006 05:59:03 +0000 (22:59 -0700)]
[SCTP]: Fix persistent slowdown in sctp when a gap ack consumes rx buffer.

In the event that our entire receive buffer is full with a series of
chunks that represent a single gap-ack, and then we accept a chunk
(or chunks) that fill in the gap between the ctsn and the first gap,
we renege chunks from the end of the buffer, which effectively does
nothing but move our gap to the end of our received tsn stream. This
does little but move our missing tsns down stream a little, and, if the
sender is sending sufficiently large retransmit frames, the result is a
perpetual slowdown which can never be recovered from, since the only
chunk that can be accepted to allow progress in the tsn stream necessitates
that a new gap be created to make room for it. This leads to a constant
need for retransmits, and subsequent receiver stalls. The fix I've come up
with is to deliver the frame without reneging if we have a full receive
buffer and the receiving sockets sk_receive_queue is empty(indicating that
the receive buffer is being blocked by a missing tsn).

Signed-off-by: Neil Horman <nhorman@tuxdriver.com>
Signed-off-by: Sridhar Samudrala <sri@us.ibm.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
16 years ago[SCTP]: Send only 1 window update SACK per message.
Tsutomu Fujii [Sun, 18 Jun 2006 05:58:28 +0000 (22:58 -0700)]
[SCTP]: Send only 1 window update SACK per message.

Right now, every time we increase our rwnd by more then MTU bytes, we
trigger a SACK.  When processing large messages, this will generate a
SACK for almost every other SCTP fragment. However since we are freeing
the entire message at the same time, we might as well collapse the SACK
generation to 1.

Signed-off-by: Tsutomu Fujii <t-fujii@nb.jp.nec.com>
Signed-off-by: Vlad Yasevich <vladislav.yasevich@hp.com>
Signed-off-by: Sridhar Samudrala <sri@us.ibm.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
16 years ago[SCTP]: Don't do CRC32C checksum over loopback.
Sridhar Samudrala [Sun, 18 Jun 2006 05:57:28 +0000 (22:57 -0700)]
[SCTP]: Don't do CRC32C checksum over loopback.

Signed-off-by: Sridhar Samudrala <sri@us.ibm.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
16 years ago[SCTP] Reset rtt_in_progress for the chunk when processing its sack.
Vlad Yasevich [Sun, 18 Jun 2006 05:56:08 +0000 (22:56 -0700)]
[SCTP] Reset rtt_in_progress for the chunk when processing its sack.

Signed-off-by: Vlad Yasevich <vladislav.yasevich@hp.com>
Signed-off-by: Sridhar Samudrala <sri@us.ibm.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
16 years ago[SCTP]: Reject sctp packets with broadcast addresses.
Vlad Yasevich [Sun, 18 Jun 2006 05:55:35 +0000 (22:55 -0700)]
[SCTP]: Reject sctp packets with broadcast addresses.

Signed-off-by: Vlad Yasevich <vladislav.yasevich@hp.com>
Signed-off-by: Sridhar Samudrala <sri@us.ibm.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
16 years ago[SCTP]: Limit association max_retrans setting in setsockopt.
Vlad Yasevich [Sun, 18 Jun 2006 05:54:51 +0000 (22:54 -0700)]
[SCTP]: Limit association max_retrans setting in setsockopt.

When using ASSOCINFO socket option, we need to limit the number of
maximum association retransmissions to be no greater than the sum
of all the path retransmissions. This is specified in Section 7.1.2
of the SCTP socket API draft.
However, we only do this if the association has multiple paths. If
there is only one path, the protocol stack will use the
assoc_max_retrans setting when trying to retransmit packets.

Signed-off-by: Vlad Yasevich <vladislav.yasevich@hp.com>
Signed-off-by: Sridhar Samudrala <sri@us.ibm.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
16 years ago[PFKEYV2]: Fix inconsistent typing in struct sadb_x_kmprivate.
Tushar Gohad [Sun, 18 Jun 2006 05:54:03 +0000 (22:54 -0700)]
[PFKEYV2]: Fix inconsistent typing in struct sadb_x_kmprivate.

Signed-off-by: Tushar Gohad <tgohad@mvista.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
16 years ago[IPV6]: Sum real space for RTAs.
YOSHIFUJI Hideaki [Sun, 18 Jun 2006 05:48:48 +0000 (22:48 -0700)]
[IPV6]: Sum real space for RTAs.

This patch fixes RTNLGRP_IPV6_IFINFO netlink notifications.  Issue
pointed out by Patrick McHardy <kaber@trash.net>.

Signed-off-by: YOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org>
Acked-by: Patrick McHardy <kaber@trash.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
16 years agoMerge branch 'master' into upstream
Jeff Garzik [Sun, 18 Jun 2006 05:22:42 +0000 (01:22 -0400)]
Merge branch 'master' into upstream

16 years ago[IRDA]: Use put_unaligned() in irlmp_do_discovery().
David S. Miller [Sun, 18 Jun 2006 05:16:13 +0000 (22:16 -0700)]
[IRDA]: Use put_unaligned() in irlmp_do_discovery().

irda_device_info->hints[] is byte aligned but is being
accessed as a u16

Based upon a patch by Luke Yang <luke.adi@gmail.com>.

Signed-off-by: David S. Miller <davem@davemloft.net>
16 years ago[BRIDGE]: Add support for NETIF_F_HW_CSUM devices
Herbert Xu [Sun, 18 Jun 2006 05:06:45 +0000 (22:06 -0700)]
[BRIDGE]: Add support for NETIF_F_HW_CSUM devices

As it is the bridge will only ever declare NETIF_F_IP_CSUM even if all
its constituent devices support NETIF_F_HW_CSUM.  This patch fixes
this by supporting the first one out of NETIF_F_NO_CSUM,
NETIF_F_HW_CSUM, and NETIF_F_IP_CSUM that is supported by all
constituent devices.

Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: David S. Miller <davem@davemloft.net>
16 years ago[NET]: Add NETIF_F_GEN_CSUM and NETIF_F_ALL_CSUM
Herbert Xu [Sun, 18 Jun 2006 05:06:05 +0000 (22:06 -0700)]
[NET]: Add NETIF_F_GEN_CSUM and NETIF_F_ALL_CSUM

The current stack treats NETIF_F_HW_CSUM and NETIF_F_NO_CSUM
identically so we test for them in quite a few places.  For the sake
of brevity, I'm adding the macro NETIF_F_GEN_CSUM for these two.  We
also test the disjunct of NETIF_F_IP_CSUM and the other two in various
places, for that purpose I've added NETIF_F_ALL_CSUM.

Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: David S. Miller <davem@davemloft.net>
16 years ago[TG3]: Convert to non-LLTX
Michael Chan [Sun, 18 Jun 2006 04:58:45 +0000 (21:58 -0700)]
[TG3]: Convert to non-LLTX

Herbert Xu pointed out that it is unsafe to call netif_tx_disable()
from LLTX drivers because it uses dev->xmit_lock to synchronize
whereas LLTX drivers use private locks.

Convert tg3 to non-LLTX to fix this issue. tg3 is a lockless driver
where hard_start_xmit and tx completion handling can run concurrently
under normal conditions. A tx_lock is only needed to prevent
netif_stop_queue and netif_wake_queue race condtions when the queue
is full.

So whether we use LLTX or non-LLTX, it makes practically no
difference.

Signed-off-by: Michael Chan <mchan@broadcom.com>
Signed-off-by: David S. Miller <davem@davemloft.net>