]> git.proxmox.com Git - mirror_ubuntu-disco-kernel.git/log
mirror_ubuntu-disco-kernel.git
17 years agoNOHZ: prevent multiplication overflow - stop timer for huge timeouts
Thomas Gleixner [Tue, 29 May 2007 21:47:39 +0000 (23:47 +0200)]
NOHZ: prevent multiplication overflow - stop timer for huge timeouts

get_next_timer_interrupt() returns a delta of (LONG_MAX > 1) in case
there is no timer pending. On 64 bit machines this results in a
multiplication overflow in tick_nohz_stop_sched_tick().

Reported by: Dave Miller <davem@davemloft.net>

Make the return value a constant and limit the return value to a 32 bit
value.

When the max timeout value is returned, we can safely stop the tick
timer device. The max jiffies delta results in a 12 days timeout for
HZ=1000.

In the long term the get_next_timer_interrupt() code needs to be
reworked to return ktime instead of jiffies, but we have to wait until
the last users of the original NO_IDLE_HZ code are converted.

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Acked-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
17 years agoMerge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6
Linus Torvalds [Tue, 29 May 2007 21:03:42 +0000 (14:03 -0700)]
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6

* 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6:
  [SPARC64]: Fill holes in hypervisor APIs and fix KTSB registry.
  [SPARC64]: Fix two bugs wrt. kernel 4MB TSB.
  [SPARC]: Mark as emulating cmpxchg, add appropriate depends for DRM.
  [SPARC]: Emulate cmpxchg like parisc
  [SPARC64]: Fix _PAGE_EXEC_4U check in sun4u I-TLB miss handler.
  [SPARC]: Linux always started with 9600 8N1
  [SPARC64]: arch/sparc64/time.c doesn't compile on Ultra 1 (no PCI)
  [SPARC64]: Eliminate NR_CPUS limitations.
  [SPARC64]: Use machine description and OBP properly for cpu probing.
  [SPARC64]: Negotiate hypervisor API for PCI services.
  [SPARC64]: Report proper system soft state to the hypervisor.
  [SPARC64]: Fix typo in sun4v_hvapi_register error handling.
  [SCSI] ESP: Kill SCSI_ESP_CORE and link directly just like jazz_esp
  [SCSI] jazz_esp: Converted to use esp_core.
  [SPARC64]: PCI device scan is way too verbose by default.
  [SERIAL] sunzilog: section mismatch fix
  [SPARC32]: Removes mismatch section warnigs in sparc time.c file
  [SPARC64]: Don't be picky about virtual-dma values on sun4v.
  [SPARC64]: Kill unused DIE_PAGE_FAULT enum value.
  [SCSI] pluto: Use wait_for_completion_timeout.

17 years agoMerge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394...
Linus Torvalds [Tue, 29 May 2007 20:45:38 +0000 (13:45 -0700)]
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6:
  firewire: fix return code
  firewire: prefix modules with firewire- instead of fw-
  firewire: Add missing byteswapping for receive DMA programs.
  ieee1394: raw1394: Fix async send
  ieee1394: eth1394: bring back a parent device
  ieee1394: eth1394: handle tlabel exhaustion
  ieee1394: eth1394: remove bogus netif_wake_queue
  ieee1394: sbp2: include workqueue.h

17 years agoMerge branch 'hwmon-for-linus' of git://jdelvare.pck.nerim.net/jdelvare-2.6
Linus Torvalds [Tue, 29 May 2007 20:44:34 +0000 (13:44 -0700)]
Merge branch 'hwmon-for-linus' of git://jdelvare.pck.nerim.net/jdelvare-2.6

* 'hwmon-for-linus' of git://jdelvare.pck.nerim.net/jdelvare-2.6:
  hwmon/applesmc: Handle name file creation error and deletion
  hwmon/applesmc: Simplify dependencies
  hwmon-vid: Don't spam the logs when VRM version is missing
  hwmon/w83627hf: Be quiet when no chip is found
  hwmon/coretemp: Add more safety checks
  hwmon/ds1621: Fix swapped temperature limits

17 years agoMerge branch 'for_paulus' of master.kernel.org:/pub/scm/linux/kernel/git/galak/powerpc
Linus Torvalds [Tue, 29 May 2007 20:42:28 +0000 (13:42 -0700)]
Merge branch 'for_paulus' of master.kernel.org:/pub/scm/linux/kernel/git/galak/powerpc

* 'for_paulus' of master.kernel.org:/pub/scm/linux/kernel/git/galak/powerpc:
  [POWERPC] Fix Kconfig warning
  [PPC] Fix modpost warning
  [POWERPC] Fix modpost warning
  [POWERPC] Fix Section mismatch warnings
  [POWERPC] QE: fix Kconfig 'select' warning with UCC_FAST
  [POWERPC] 52xx: unbreak lite5200 dts (_pic vs. -pic)
  [PPC] Remove duplicate export of __div64_32.
  [PPC] Fix COMMON symbol warnings

17 years agoMerge master.kernel.org:/pub/scm/linux/kernel/git/jejb/scsi-rc-fixes-2.6
Linus Torvalds [Tue, 29 May 2007 20:39:52 +0000 (13:39 -0700)]
Merge master.kernel.org:/pub/scm/linux/kernel/git/jejb/scsi-rc-fixes-2.6

* master.kernel.org:/pub/scm/linux/kernel/git/jejb/scsi-rc-fixes-2.6:
  [SCSI] megaraid_sas: intercept cmd timeout and throttle io
  [SCSI] fusion: Fix |/|| confusion
  [SCSI] aic94xx: asd_clear_nexus should fail if the cleared task does not complete
  [SCSI] aic7xxx: fix aicasm build failure with gcc-3.4.6
  [SCSI] aacraid: apply commit config for reset_devices flag
  [SCSI] sd: fix refcounting regression in suspend/resume routines
  [SCSI] aacraid: fix panic on short Inquiry
  [SCSI] aacraid: Correct sa platform support. (Was: [Bug 8469] Bad EIP value on pentium3 SMP kernel-2.6.21.1)
  [SCSI] NCR53C9x: correct spelling mistake in deprecation notice
  [SCSI] tgt: fix a rdma indirect transfer error bug
  [SCSI] MegaRAID: Update MAINTAINERS email-id
  [SCSI] stex: minor cleanup and version update
  [SCSI] stex: fix reset recovery for console device
  [SCSI] stex: extend hard reset wait time
  [SCSI] stex: fix id mapping issue
  [SCSI] ipr: Proper return codes for eh_dev_reset for SATA devices
  [SCSI] zfcp: IO stall after deleting and path checker changes after reenabling zfcp devices
  [SCSI] zfcp: avoid clutter in erp_dbf

17 years agoUSB: replace flush_workqueue with cancel_sync_work
Alan Stern [Tue, 29 May 2007 20:34:52 +0000 (16:34 -0400)]
USB: replace flush_workqueue with cancel_sync_work

This patch (as912) replaces a couple of calls to flush_workqueue()
with cancel_sync_work() and cancel_rearming_delayed_work().  Using a
more directed approach allows us to avoid some nasty deadlocks.  The
prime example occurs when a first-level device (the parent is a root
hub) is removed while at the same time the root hub gets a remote
wakeup request.  khubd would try to flush the autosuspend workqueue
while holding the root-hub's lock, and the remote-wakeup workqueue
routine would be waiting to lock the root hub.

The patch also reorganizes the power management portion of
usb_disconnect(), separating it out into its own routine.  The
autosuspend workqueue entry is cancelled immediately instead of
waiting for the device's release routine.  In addition,
synchronization with the autosuspend thread is carried out even for
root hubs (an oversight in the original code).

Signed-off-by: Alan Stern <stern@rowland.harvard.edu>
Cc: Andrew Morton <akpm@linux-foundation.org>
Cc: Greg KH <gregkh@suse.de>
Cc: Mark Lord <lkml@rtr.ca>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
17 years ago[SPARC64]: Fill holes in hypervisor APIs and fix KTSB registry.
David S. Miller [Tue, 29 May 2007 09:22:14 +0000 (02:22 -0700)]
[SPARC64]: Fill holes in hypervisor APIs and fix KTSB registry.

Several interfaces were missing and others misnumbered or
improperly documented.

Also, make sure to check the return value when registering
the kernel TSBs with the hypervisor.  This helped to find
the 4MB kernel TSB alignment bug fixed in a previous changeset.

Signed-off-by: David S. Miller <davem@davemloft.net>
17 years ago[SPARC64]: Fix two bugs wrt. kernel 4MB TSB.
David S. Miller [Tue, 29 May 2007 08:58:31 +0000 (01:58 -0700)]
[SPARC64]: Fix two bugs wrt. kernel 4MB TSB.

1) The TSB lookup was not using the correct hash mask.

2) It was not aligned on a boundary equal to it's size,
   which is required by the sun4v Hypervisor.

wasn't having it's return value checked, and that bug will be fixed up
as well in a subsequent changeset.

Signed-off-by: David S. Miller <davem@davemloft.net>
17 years ago[SPARC]: Mark as emulating cmpxchg, add appropriate depends for DRM.
Martin Habets [Tue, 29 May 2007 08:11:57 +0000 (01:11 -0700)]
[SPARC]: Mark as emulating cmpxchg, add appropriate depends for DRM.

The DRM code depends on an atomic version of cmpxchg(), which is not
available on sparc32. Since other platforms besides sparc32 have this
issue a KCONFIG option is added for it.

Signed-off-by: Martin Habets <errandir_news@mph.eclipse.co.uk>
Signed-off-by: David S. Miller <davem@davemloft.net>
17 years ago[SPARC]: Emulate cmpxchg like parisc
Kyle McMartin [Tue, 29 May 2007 09:51:13 +0000 (02:51 -0700)]
[SPARC]: Emulate cmpxchg like parisc

Signed-off-by: Kyle McMartin <kyle@parisc-linux.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
17 years ago[SPARC64]: Fix _PAGE_EXEC_4U check in sun4u I-TLB miss handler.
David S. Miller [Mon, 28 May 2007 03:24:47 +0000 (20:24 -0700)]
[SPARC64]: Fix _PAGE_EXEC_4U check in sun4u I-TLB miss handler.

It was using an immediate _PAGE_EXEC_4U value in an 'and'
instruction to perform the test.  This doesn't work because
the immediate field is signed 13-bit, this the mask being
tested against the PTE was 0x1000 sign-extended to 32-bits
instead of just plain 0x1000.

Signed-off-by: David S. Miller <davem@davemloft.net>
17 years ago[SPARC]: Linux always started with 9600 8N1
Jan Engelhardt [Sun, 27 May 2007 21:48:54 +0000 (14:48 -0700)]
[SPARC]: Linux always started with 9600 8N1

The Linux kernel ignored the PROM's serial settings (115200,n,8,1 in
my case). This was because mode_prop remained "ttyX-mode" (expected:
"ttya-mode") due to the constness of string literals when used with
"char *". Since there is no "ttyX-mode" property in the PROM, Linux
always used the default 9600.

[ Investigation of the suncore.s assembler reveals that gcc optimizied
  away the stores, yet did not emit a warning, which is a pretty
  anti-social thing to do and is the only reason this bug lived for
  so long -DaveM ]

Signed-off-by: Jan Engelhardt <jengelh@gmx.de>
Signed-off-by: David S. Miller <davem@davemloft.net>
17 years ago[SPARC64]: arch/sparc64/time.c doesn't compile on Ultra 1 (no PCI)
Horst H. von Brand [Sun, 27 May 2007 00:47:53 +0000 (17:47 -0700)]
[SPARC64]: arch/sparc64/time.c doesn't compile on Ultra 1 (no PCI)

This is bug 8540 on bugzilla.kernel.org

arch/sparc64/time.c contains references to assorted bq4802 stuff if
CONFIG_PCI is not set, and compile fails. I #ifdef'ed out everything
that looks PCI-ish in that file.

Signed-off-by: David S. Miller <davem@davemloft.net>
17 years ago[SPARC64]: Eliminate NR_CPUS limitations.
David S. Miller [Sat, 26 May 2007 08:14:43 +0000 (01:14 -0700)]
[SPARC64]: Eliminate NR_CPUS limitations.

Cheetah systems can have cpuids as large as 1023, although physical
systems don't have that many cpus.

Only three limitations existed in the kernel preventing arbitrary
NR_CPUS values:

1) dcache dirty cpu state stored in page->flags on
   D-cache aliasing platforms.  With some build time
   calculations and some build-time BUG checks on
   page->flags layout, this one was easily solved.

2) The cheetah XCALL delivery code could only handle
   a cpumask with up to 32 cpus set.  Some simple looping
   logic clears that up too.

3) thread_info->cpu was a u8, easily changed to a u16.

There are a few spots in the kernel that still put NR_CPUS
sized arrays on the kernel stack, but that's not a sparc64
specific problem.

Signed-off-by: David S. Miller <davem@davemloft.net>
17 years ago[SPARC64]: Use machine description and OBP properly for cpu probing.
David S. Miller [Fri, 25 May 2007 22:49:59 +0000 (15:49 -0700)]
[SPARC64]: Use machine description and OBP properly for cpu probing.

Signed-off-by: David S. Miller <davem@davemloft.net>
17 years ago[SPARC64]: Negotiate hypervisor API for PCI services.
David S. Miller [Fri, 25 May 2007 08:04:15 +0000 (01:04 -0700)]
[SPARC64]: Negotiate hypervisor API for PCI services.

Signed-off-by: David S. Miller <davem@davemloft.net>
17 years ago[SPARC64]: Report proper system soft state to the hypervisor.
David S. Miller [Fri, 25 May 2007 07:37:12 +0000 (00:37 -0700)]
[SPARC64]: Report proper system soft state to the hypervisor.

Signed-off-by: David S. Miller <davem@davemloft.net>
17 years ago[SPARC64]: Fix typo in sun4v_hvapi_register error handling.
David S. Miller [Fri, 25 May 2007 07:33:49 +0000 (00:33 -0700)]
[SPARC64]: Fix typo in sun4v_hvapi_register error handling.

Signed-off-by: David S. Miller <davem@davemloft.net>
17 years ago[SCSI] ESP: Kill SCSI_ESP_CORE and link directly just like jazz_esp
David S. Miller [Wed, 23 May 2007 06:48:10 +0000 (23:48 -0700)]
[SCSI] ESP: Kill SCSI_ESP_CORE and link directly just like jazz_esp

Signed-off-by: David S. Miller <davem@davemloft.net>
17 years ago[SCSI] jazz_esp: Converted to use esp_core.
Thomas Bogendoerfer [Wed, 23 May 2007 00:03:44 +0000 (17:03 -0700)]
[SCSI] jazz_esp: Converted to use esp_core.

Use new esp_scsi for JAZZ SCSI host adapter driver

Signed-off-by: Thomas Bogendoerfer <tsbogend@alpha.franken.de>
Signed-off-by: David S. Miller <davem@davemloft.net>
17 years ago[SPARC64]: PCI device scan is way too verbose by default.
David S. Miller [Tue, 22 May 2007 08:24:14 +0000 (01:24 -0700)]
[SPARC64]: PCI device scan is way too verbose by default.

These messages were very useful when bringing up the
OBP based PCI device scan code, but it's just a lot
of noise every bootup now especially on big machines.

The messages can be re-enabled via 'ofpci_debug=1' on
the kernel command line.

Signed-off-by: David S. Miller <davem@davemloft.net>
17 years ago[SERIAL] sunzilog: section mismatch fix
Krzysztof Helt [Sat, 19 May 2007 19:06:02 +0000 (12:06 -0700)]
[SERIAL] sunzilog: section mismatch fix

This patch fixes section mismatch warnings in the sunzilog driver.

Signed-off-by: Krzysztof Helt <krzysztof.h1@wp.pl>
Signed-off-by: David S. Miller <davem@davemloft.net>
17 years ago[SPARC32]: Removes mismatch section warnigs in sparc time.c file
Krzysztof Helt [Sat, 19 May 2007 19:03:24 +0000 (12:03 -0700)]
[SPARC32]: Removes mismatch section warnigs in sparc time.c file

This patch removes mismatch section warnings in the
sparc/kernel/time.c file.

Signed-off-by: Krzysztof Helt <krzysztof.h1@wp.pl>
Signed-off-by: David S. Miller <davem@davemloft.net>
17 years ago[SPARC64]: Don't be picky about virtual-dma values on sun4v.
David S. Miller [Thu, 24 May 2007 01:00:46 +0000 (18:00 -0700)]
[SPARC64]: Don't be picky about virtual-dma values on sun4v.

Handle arbitrary base and length values as long as they
are multiples of IO_PAGE_SIZE.

Bug found by Arun Kumar Rao.

Signed-off-by: David S. Miller <davem@davemloft.net>
17 years ago[SPARC64]: Kill unused DIE_PAGE_FAULT enum value.
Christoph Hellwig [Wed, 23 May 2007 21:57:49 +0000 (14:57 -0700)]
[SPARC64]: Kill unused DIE_PAGE_FAULT enum value.

sparc64 got rid of the pagefault notifiers, so the enum value for them
can go away aswell.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: David S. Miller <davem@davemloft.net>
17 years ago[SCSI] pluto: Use wait_for_completion_timeout.
Christoph Hellwig [Wed, 23 May 2007 21:56:45 +0000 (14:56 -0700)]
[SCSI] pluto: Use wait_for_completion_timeout.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: David S. Miller <davem@davemloft.net>
17 years agofirewire: fix return code
Jeff Garzik [Sun, 27 May 2007 11:09:18 +0000 (07:09 -0400)]
firewire: fix return code

Fix this warning on x86-64

drivers/firewire/fw-cdev.c:798: warning: initialization from incompatible pointer type

by making the return code of ioctl_send_request() the same as all the
other ioctl_xxx() return codes.

Signed-off-by: Jeff Garzik <jeff@garzik.org>
Signed-off-by: Stefan Richter <stefanr@s5r6.in-berlin.de>
17 years agofirewire: prefix modules with firewire- instead of fw-
Stefan Richter [Fri, 25 May 2007 11:54:49 +0000 (13:54 +0200)]
firewire: prefix modules with firewire- instead of fw-

Of course everybody immediately associates "fw-" with FireWire, not
firmware or firewall or whatever.  But "firewire-" has a nice ring to
it too.

Signed-off-by: Stefan Richter <stefanr@s5r6.in-berlin.de>
Acked-by: Kristian Hoegsberg <krh@bitplanet.net>
17 years agofirewire: Add missing byteswapping for receive DMA programs.
Kristian Høgsberg [Tue, 22 May 2007 22:55:48 +0000 (18:55 -0400)]
firewire: Add missing byteswapping for receive DMA programs.

Signed-off-by: Kristian Hoegsberg <krh@redhat.com>
Signed-off-by: Stefan Richter <stefanr@s5r6.in-berlin.de>
17 years agoieee1394: raw1394: Fix async send
Petr Vandrovec [Mon, 14 May 2007 05:14:44 +0000 (22:14 -0700)]
ieee1394: raw1394: Fix async send

While playing with libiec61883 I've noticed that async_send is broken
because it was doing copy_from_user(...., packet->data_size) before
packet->data_size was set to any useful value.  It got broken when
packet->allocated_data_size got introduced, as hpsb_alloc_packet does
not set packet->data_size anymore.  (Regression in 2.6.22-rc1)

Signed-off-by: Petr Vandrovec <petr@vandrovec.name>
Signed-off-by: Stefan Richter <stefanr@s5r6.in-berlin.de>
17 years agoieee1394: eth1394: bring back a parent device
Stefan Richter [Sun, 20 May 2007 23:05:41 +0000 (01:05 +0200)]
ieee1394: eth1394: bring back a parent device

This adds a real parent device to eth1394's ethX device like in Linux
2.6.20 and older.  However, due to unfinished conversion of the ieee1394
away from class_device, we now refer to the FireWire controller's PCI
device as the parent, not to the ieee1394 driver's fw-host device.

Having a real parent device instead of a virtual one allows udev scripts
to distinguish eth1394 interfaces from networking bridges, bondings and
the likes.

Fixes a regression since 2.6.21:
https://bugs.gentoo.org/show_bug.cgi?id=177199

Signed-off-by: Stefan Richter <stefanr@s5r6.in-berlin.de>
17 years agoieee1394: eth1394: handle tlabel exhaustion
Stefan Richter [Sat, 5 May 2007 15:25:51 +0000 (17:25 +0200)]
ieee1394: eth1394: handle tlabel exhaustion

When eth1394 was unable to acquire a transaction label, it just dropped
outgoing packets without attempt to resend them later.

The transmit queue is now halted if no tlabel is available to
->hard_start_xmit().  A workqueue job is then scheduled to catch the
moment when ieee1394 recycled the next lot of tlabels.

Fixes http://bugzilla.kernel.org/show_bug.cgi?id=8402

Signed-off-by: Stefan Richter <stefanr@s5r6.in-berlin.de>
17 years agoieee1394: eth1394: remove bogus netif_wake_queue
Stefan Richter [Sat, 5 May 2007 15:19:09 +0000 (17:19 +0200)]
ieee1394: eth1394: remove bogus netif_wake_queue

When we are within hard_start_xmit, the queue is already awake.

Signed-off-by: Stefan Richter <stefanr@s5r6.in-berlin.de>
17 years agoieee1394: sbp2: include workqueue.h
Stefan Richter [Sat, 5 May 2007 15:18:12 +0000 (17:18 +0200)]
ieee1394: sbp2: include workqueue.h

Signed-off-by: Stefan Richter <stefanr@s5r6.in-berlin.de>
17 years agohwmon/applesmc: Handle name file creation error and deletion
Nicolas Boichat [Sun, 27 May 2007 20:17:43 +0000 (22:17 +0200)]
hwmon/applesmc: Handle name file creation error and deletion

The previous patch was incomplete.

Signed-off-by: Nicolas Boichat <nicolas@boichat.ch>
Signed-off-by: Jean Delvare <khali@linux-fr.org>
17 years agohwmon/applesmc: Simplify dependencies
Jean Delvare [Sun, 27 May 2007 20:17:43 +0000 (22:17 +0200)]
hwmon/applesmc: Simplify dependencies

The dependency upon HWMON is now handled at menu level.

Signed-off-by: Jean Delvare <khali@linux-fr.org>
Cc: Nicolas Boichat <nicolas@boichat.ch>
17 years agohwmon-vid: Don't spam the logs when VRM version is missing
Jean Delvare [Sun, 27 May 2007 20:17:43 +0000 (22:17 +0200)]
hwmon-vid: Don't spam the logs when VRM version is missing

If we cannot guess which VRM version the CPU uses, we set it to 0 and
log it. So we shouldn't spam the log each time vid_from_reg() is
later called with vrm 0.

Signed-off-by: Jean Delvare <khali@linux-fr.org>
Acked-by: Rudolf Marek <r.marek@assembler.cz>
17 years agohwmon/w83627hf: Be quiet when no chip is found
Jean Delvare [Sun, 27 May 2007 20:17:43 +0000 (22:17 +0200)]
hwmon/w83627hf: Be quiet when no chip is found

Signed-off-by: Jean Delvare <khali@linux-fr.org>
17 years agohwmon/coretemp: Add more safety checks
Rudolf Marek [Sun, 27 May 2007 20:17:43 +0000 (22:17 +0200)]
hwmon/coretemp: Add more safety checks

Add detection of AE18 Errata of Core processor and warns
users that the absolute readings might be wrong for Core2 processor.

Signed-off-by: Rudolf Marek <r.marek@assembler.cz>
Signed-off-by: Jean Delvare <khali@linux-fr.org>
17 years agohwmon/ds1621: Fix swapped temperature limits
Jean Delvare [Sun, 27 May 2007 20:17:43 +0000 (22:17 +0200)]
hwmon/ds1621: Fix swapped temperature limits

The low temperature limit and the high temperature limit registers
have been accidentally swapped, causing alarms to trigger
when they shouldn't.

Signed-off-by: Jean Delvare <khali@linux-fr.org>
Acked-by: Aurelien Jarno <aurelien@aurel32.net>
17 years agoLinux 2.6.22-rc3
Linus Torvalds [Sat, 26 May 2007 02:55:14 +0000 (19:55 -0700)]
Linux 2.6.22-rc3

It's that time of the year again.  Summer starts in the US, and people
want to sit at the beach with a new -rc candidate.

Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
17 years agofix compat console unimap regression
Hugh Dickins [Fri, 25 May 2007 23:39:17 +0000 (00:39 +0100)]
fix compat console unimap regression

Why is it that since the 2f1a2ccb9c0de632ab07193becf5f7121794f6ae console
UTF-8 fixes went into 2.6.22-rc1, the PowerMac G5 shows only inverse video
question marks for the text on tty2-6? whereas tty1 is fine, and so is x86.

No fault of that patch: by removing the old fallback behaviour, it reveals
that 32-bit setfont running on 64-bit kernels has only really worked on
the current console, the rest getting faked by that inadequate fallback.

Bring the compat do_unimap_ioctl into line with the main one: PIO_UNIMAP
and GIO_UNIMAP apply to the specified tty, not redirected to fg_console.
Use the same checks, and most particularly, remember to check access_ok:
con_set_unimap and con_get_unimap are using __get_user and __put_user.

And the compat vt_check should ask for the same capability as the main
one, CAP_SYS_TTY_CONFIG rather than CAP_SYS_ADMIN.  Added in vt_ioctl's
vc_cons_allocated check for safety, though failure may well be impossible.

Signed-off-by: Hugh Dickins <hugh@veritas.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
17 years agoMerge branch 'for-linus' of master.kernel.org:/pub/scm/linux/kernel/git/roland/infiniband
Linus Torvalds [Fri, 25 May 2007 22:49:56 +0000 (15:49 -0700)]
Merge branch 'for-linus' of master.kernel.org:/pub/scm/linux/kernel/git/roland/infiniband

* 'for-linus' of master.kernel.org:/pub/scm/linux/kernel/git/roland/infiniband:
  IPoIB/cm: Drain cq in ipoib_cm_dev_stop()
  IPoIB/cm: Fix timeout check in ipoib_cm_dev_stop()
  IB/ehca: Fix number of send WRs reported for new QP
  IB/mlx4: Initialize send queue entry ownership bits
  IB/mlx4: Don't allocate RQ doorbell if using SRQ

17 years agoMerge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik...
Linus Torvalds [Fri, 25 May 2007 22:48:24 +0000 (15:48 -0700)]
Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev

* 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev:
  pata_hpt37x: Further improvements based on the IDE updates and vendor drivers
  pata: Trivia
  [libata] sata_via, pata_via: Add PCI IDs.
  [libata] Fix decoding of 6-byte commands
  libata: sata_sis fixes
  Fix build failure for drivers/ata/pata_scc.c
  [libata] sata_mv: add TODO list
  [libata] sata_promise: fix flags typo

17 years agopata_hpt37x: Further improvements based on the IDE updates and vendor drivers
Alan Cox [Fri, 25 May 2007 19:48:55 +0000 (20:48 +0100)]
pata_hpt37x: Further improvements based on the IDE updates and vendor drivers

Better DPLL use and calibration

Signed-off-by: Alan Cox <alan@redhat.com>
Signed-off-by: Jeff Garzik <jeff@garzik.org>
17 years agopata: Trivia
Alan Cox [Fri, 25 May 2007 19:39:30 +0000 (20:39 +0100)]
pata: Trivia

Typo/comment fixes

Signed-off-by: Alan Cox <alan@redhat.com>
Signed-off-by: Jeff Garzik <jeff@garzik.org>
17 years ago[PATCH] ocfs2: use generic_segment_checks
Christoph Hellwig [Fri, 18 May 2007 11:12:40 +0000 (13:12 +0200)]
[PATCH] ocfs2: use generic_segment_checks

Signed-off-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Mark Fasheh <mark.fasheh@oracle.com>
17 years agoocfs2: fix inode leak
Mark Fasheh [Thu, 10 May 2007 00:34:26 +0000 (17:34 -0700)]
ocfs2: fix inode leak

We weren't cleaning up our inode reference on error in
ocfs2_reserve_local_alloc_bits(). Add a check for error return and iput() if
need be. Move the code to set the alloc context inode info to the end of the
function so we don't have any possibility of passing back a bad pointer.

Signed-off-by: Mark Fasheh <mark.fasheh@oracle.com>
17 years ago[PATCH] ocfs2: use zero_user_page
Nate Diller [Fri, 11 May 2007 05:56:01 +0000 (22:56 -0700)]
[PATCH] ocfs2: use zero_user_page

Use zero_user_page() instead of open-coding it.

Signed-off-by: Nate Diller <nate.diller@gmail.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Mark Fasheh <mark.fasheh@oracle.com>
17 years agoocfs2: unmap_mapping_range() in ocfs2_truncate()
Mark Fasheh [Mon, 14 May 2007 18:39:40 +0000 (11:39 -0700)]
ocfs2: unmap_mapping_range() in ocfs2_truncate()

We weren't calling this before, but since ocfs2 handles the entire truncate
operation, we should.

Signed-off-by: Mark Fasheh <mark.fasheh@oracle.com>
17 years agoocfs2: trylock in ocfs2_readpage()
Mark Fasheh [Mon, 14 May 2007 18:38:51 +0000 (11:38 -0700)]
ocfs2: trylock in ocfs2_readpage()

Similarly to the page lock / cluster lock inversion in ocfs2_readpage, we
can deadlock on ip_alloc_sem. We can down_read_trylock() instead and just
return AOP_TRUNCATED_PAGE if the operation fails.

Signed-off-by: Mark Fasheh <mark.fasheh@oracle.com>
17 years ago[libata] sata_via, pata_via: Add PCI IDs.
Jeff Garzik [Fri, 25 May 2007 09:02:06 +0000 (05:02 -0400)]
[libata] sata_via, pata_via: Add PCI IDs.

Supplied by VIA.

Also, convert named constants to hex values in the pata_via
PCI ID table.  (standard libata policy for PCI device IDs, which are
considered simply arbitrary hex numbers, without a need to create a
single-use constant in linux/pci_ids.h)

Signed-off-by: Jeff Garzik <jeff@garzik.org>
17 years ago[libata] Fix decoding of 6-byte commands
Jeff Garzik [Fri, 25 May 2007 08:39:39 +0000 (04:39 -0400)]
[libata] Fix decoding of 6-byte commands

The code for parsing 6-byte SCSI command LBAs
missed the top 5 bits (the MSB).

Signed-off-by: Jeff Garzik <jeff@garzik.org>
17 years agolibata: sata_sis fixes
Uwe Koziolek [Fri, 25 May 2007 07:48:52 +0000 (09:48 +0200)]
libata: sata_sis fixes

The sata_sis driver supports SATA and PATA ports. The broken support
of both types in one controller is fixed.

Signed-off-by: Uwe Koziolek <uwe.koziolek@gmx.net>
Signed-off-by: Jeff Garzik <jeff@garzik.org>
17 years agoFix build failure for drivers/ata/pata_scc.c
Tony Breeds [Wed, 23 May 2007 21:26:43 +0000 (14:26 -0700)]
Fix build failure for drivers/ata/pata_scc.c

The commit d4b2bab4f26345ea1803feb23ea92fbe3f6b77bc added deadline support
to prereset and reset methods to libbata the pata_scc driver wasn't
converted.  This patch is a naive attempt to bring this driver up to
scratch.

Build failures are:
drivers/ata/pata_scc.c: In function 'scc_pata_prereset':
drivers/ata/pata_scc.c:870: error: too few arguments to function 'ata_std_prereset'
drivers/ata/pata_scc.c: In function 'scc_error_handler':
drivers/ata/pata_scc.c:916: warning: passing argument 2 of 'ata_bmdma_drive_eh' from incompatible pointer type
drivers/ata/pata_scc.c:916: warning: passing argument 3 of 'ata_bmdma_drive_eh' from incompatible pointer type
drivers/ata/pata_scc.c: In function 'scc_pata_prereset':
drivers/ata/pata_scc.c:871: warning: control reaches end of non-void function

On a releated note scc_bus_post_reset() is (AFACT) identical to
ata_bus_post_reset(), would a patch to make ata_bus_post_reset() assesable
to drivers be accepted?

Signed-off-by: Tony Breeds <tony@bakeyournoodle.com>
Acked-by: Tejun Heo <htejun@gmail.com>
Cc: Akira Iguchi <akira2.iguchi@toshiba.co.jp>
Cc: Jeff Garzik <jgarzik@pobox.com>
Cc: Alan Cox <alan@lxorguk.ukuu.org.uk>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Jeff Garzik <jeff@garzik.org>
17 years ago[libata] sata_mv: add TODO list
Jeff Garzik [Fri, 25 May 2007 03:40:15 +0000 (23:40 -0400)]
[libata] sata_mv: add TODO list

Signed-off-by: Jeff Garzik <jeff@garzik.org>
17 years ago[libata] sata_promise: fix flags typo
Jeff Garzik [Fri, 25 May 2007 03:35:59 +0000 (23:35 -0400)]
[libata] sata_promise: fix flags typo

A stray comma makes all the difference.  Change to '|' as these flags
should be or'd together.

Signed-off-by: Jeff Garzik <jeff@garzik.org>
17 years agoMerge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Linus Torvalds [Fri, 25 May 2007 01:41:28 +0000 (18:41 -0700)]
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

* 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6: (25 commits)
  [XFRM]: Allow packet drops during larval state resolution.
  [CASSINI]: Check pci_set_mwi() return value.
  [NET]: "wrong timeout value" in sk_wait_data() v2
  [NETFILTER]: nf_nat_h323: call set_h225_addr instead of set_h225_addr_hook
  [NETFILTER]: nf_conntrack_h323: add missing T.120 address in OLCA
  [NETFILTER]: nf_conntrack_h323: remove unnecessary process of Information signal
  [NETFILTER]: nf_conntrack_h323: fix get_h225_addr() for IPv6 address access
  [NETFILTER]: nf_conntrack_h323: fix ASN.1 types
  [NETFILTER]: nf_conntrack_ftp: fix newline sequence number calculation
  [NETFILTER]: nf_conntrack_ftp: fix newline sequence number update
  [NET_SCHED]: sch_htb: fix event cache time calculation
  [DCCP]: Fix build warning when debugging is disabled.
  [TIPC]: Fixed erroneous introduction of for_each_netdev
  [RTNETLINK]: Fix sending netlink message when replace route.
  [TR]: Use menuconfig objects.
  [ARCNET]: Use menuconfig objects.
  [TIPC]: Use menuconfig objects.
  [SCTP]: Use menuconfig objects.
  [IPVS]: Use menuconfig objects.
  [DCCP]: Use menuconfig objects.
  ...

17 years agoMerge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik...
Linus Torvalds [Fri, 25 May 2007 01:20:42 +0000 (18:20 -0700)]
Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev

* 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev:
  pata_via: Handle laptops via DMI
  libata: -ENODEV during prereset isn't an error
  libata: don't consider 0xff as port empty if SStatus is available
  ata_piix: add short 40c quirk for Acer Aspire 2030, take #2
  pata_sis: Fix and clean up some timing setups
  hpt3x2n: Correct revision boundary

17 years ago[XFRM]: Allow packet drops during larval state resolution.
David S. Miller [Fri, 25 May 2007 01:17:54 +0000 (18:17 -0700)]
[XFRM]: Allow packet drops during larval state resolution.

The current IPSEC rule resolution behavior we have does not work for a
lot of people, even though technically it's an improvement from the
-EAGAIN buisness we had before.

Right now we'll block until the key manager resolves the route.  That
works for simple cases, but many folks would rather packets get
silently dropped until the key manager resolves the IPSEC rules.

We can't tell these folks to "set the socket non-blocking" because
they don't have control over the non-block setting of things like the
sockets used to resolve DNS deep inside of the resolver libraries in
libc.

With that in mind I coded up the patch below with some help from
Herbert Xu which provides packet-drop behavior during larval state
resolution, controllable via sysctl and off by default.

This lays the framework to either:

1) Make this default at some point or...

2) Move this logic into xfrm{4,6}_policy.c and implement the
   ARP-like resolution queue we've all been dreaming of.
   The idea would be to queue packets to the policy, then
   once the larval state is resolved by the key manager we
   re-resolve the route and push the packets out.  The
   packets would timeout if the rule didn't get resolved
   in a certain amount of time.

Signed-off-by: David S. Miller <davem@davemloft.net>
17 years ago[CASSINI]: Check pci_set_mwi() return value.
David S. Miller [Fri, 25 May 2007 00:54:15 +0000 (17:54 -0700)]
[CASSINI]: Check pci_set_mwi() return value.

Signed-off-by: David S. Miller <davem@davemloft.net>
17 years agoMerge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6
Linus Torvalds [Fri, 25 May 2007 00:38:18 +0000 (17:38 -0700)]
Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6

* 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6:
  [IA64] acpi_get_sysname() should be __init
  [IA64] Cleanup acpi header to reuse the generic _PDC defines
  [IA64] Fix using uninitialized data in _PDC setup
  [IA64] start_secondary() and smp_callin() should be __cpuinit

17 years agopata_via: Handle laptops via DMI
Alan Cox [Wed, 23 May 2007 21:39:01 +0000 (22:39 +0100)]
pata_via: Handle laptops via DMI

Oh the joy of saving a fraction of a cent using short 40 wire cables and
not faking 80wire

Teach the VIA driver that there are some systems we need to know are
magically wired for high speeds.

Signed-off-by: Alan Cox <alan@redhat.com>
Tested-by: Francis Russell <FrancisRussell@btinternet.com>
Signed-off-by: Jeff Garzik <jeff@garzik.org>
17 years agolibata: -ENODEV during prereset isn't an error
Tejun Heo [Wed, 23 May 2007 09:58:52 +0000 (11:58 +0200)]
libata: -ENODEV during prereset isn't an error

During prereset, -ENODEV return from ata_wait_ready() is not an error.
This causes unnecessary bug message on controllers which uses 0xff to
indicate empty port.  Fix it.

Signed-off-by: Tejun Heo <htejun@gmail.com>
Cc: Paul Mundt <lethal@linux-sh.org>
Signed-off-by: Jeff Garzik <jeff@garzik.org>
17 years agolibata: don't consider 0xff as port empty if SStatus is available
Tejun Heo [Wed, 23 May 2007 09:22:15 +0000 (11:22 +0200)]
libata: don't consider 0xff as port empty if SStatus is available

Some SATA controllers (sata_sil) use 0xff to indicate port not ready
status, not port empty.  As libata interprets 0xff as port empty, this
causes unnecessary reset failure and retry.  Don't consider 0xff as
port empty if SStatus is available and indicates that port is online.

Signed-off-by: tejun Heo <htejun@gmail.com>
Cc: Paul Mundt <lethal@linux-sh.org>
Cc: Indan Zupancic <indan@nul.nu>
Signed-off-by: Jeff Garzik <jeff@garzik.org>
17 years agoata_piix: add short 40c quirk for Acer Aspire 2030, take #2
Tejun Heo [Tue, 22 May 2007 09:34:22 +0000 (11:34 +0200)]
ata_piix: add short 40c quirk for Acer Aspire 2030, take #2

Acer Aspire 2023WLMi uses short 40c cable.  Add quirk for it.

Signed-off-by: Tejun Heo <htejun@gmail.com>
Cc: Steve H. <mail.pandor@gmail.com>
Signed-off-by: Jeff Garzik <jeff@garzik.org>
17 years agopata_sis: Fix and clean up some timing setups
Alan Cox [Mon, 21 May 2007 14:00:53 +0000 (15:00 +0100)]
pata_sis: Fix and clean up some timing setups

- Rename sis_port_base to sis_old_port_base() so nobody uses it for new
generation controllers in error.
- Use byte size operations where it is cleaner for mode setup
- Fix a couple of masking errors on certai chip revs when setting speeds

Signed-off-by: Alan Cox <alan@redhat.com>
Signed-off-by: Jeff Garzik <jeff@garzik.org>
17 years agohpt3x2n: Correct revision boundary
Alan Cox [Mon, 21 May 2007 13:57:01 +0000 (14:57 +0100)]
hpt3x2n: Correct revision boundary

We have a revision that isn't correctly claimed as two drivers both go
for it: Fix the test accordingly. Noticed originally by Bill Nottingham.

Signed-off-by: Alan Cox <alan@redhat.com>
Signed-off-by: Jeff Garzik <jeff@garzik.org>
17 years ago[NET]: "wrong timeout value" in sk_wait_data() v2
Vasily Averin [Thu, 24 May 2007 23:58:54 +0000 (16:58 -0700)]
[NET]: "wrong timeout value" in sk_wait_data() v2

sys_setsockopt() do not check properly timeout values for
SO_RCVTIMEO/SO_SNDTIMEO, for example it's possible to set negative timeout
values. POSIX do not defines behaviour for sys_setsockopt in case negative
timeouts, but requires that setsockopt() shall fail with -EDOM if the send and
receive timeout values are too big to fit into the timeout fields in the socket
structure.
In current implementation negative timeout can lead to error messages like
"schedule_timeout: wrong timeout value".

Proposed patch:
- checks tv_usec and returns -EDOM if it is wrong
- do not allows to set negative timeout values (sets 0 instead) and outputs
ratelimited information message about such attempts.

Signed-off-By: Vasily Averin <vvs@sw.ru>
Signed-off-by: David S. Miller <davem@davemloft.net>
17 years agoMerge git://git.kernel.org/pub/scm/linux/kernel/git/holtmann/bluetooth-2.6
David S. Miller [Thu, 24 May 2007 23:54:12 +0000 (16:54 -0700)]
Merge git://git.kernel.org/pub/scm/linux/kernel/git/holtmann/bluetooth-2.6

17 years ago[NETFILTER]: nf_nat_h323: call set_h225_addr instead of set_h225_addr_hook
Jing Min Zhao [Thu, 24 May 2007 23:44:40 +0000 (16:44 -0700)]
[NETFILTER]: nf_nat_h323: call set_h225_addr instead of set_h225_addr_hook

They're the same.

Signed-off-by: Jing Min Zhao <zhaojingmin@vivecode.com>
Signed-off-by: Patrick McHardy <kaber@trash.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
17 years ago[NETFILTER]: nf_conntrack_h323: add missing T.120 address in OLCA
Jing Min Zhao [Thu, 24 May 2007 23:44:11 +0000 (16:44 -0700)]
[NETFILTER]: nf_conntrack_h323: add missing T.120 address in OLCA

Add missing process of T.120 address in OpenLogicalChannelAck signal.

Signed-off-by: Jing Min Zhao <zhaojingmin@vivecode.com>
Signed-off-by: Patrick McHardy <kaber@trash.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
17 years ago[NETFILTER]: nf_conntrack_h323: remove unnecessary process of Information signal
Jing Min Zhao [Thu, 24 May 2007 23:43:42 +0000 (16:43 -0700)]
[NETFILTER]: nf_conntrack_h323: remove unnecessary process of Information signal

According to the implementation of H.323, it's not necessary to check
the addresses in Information signals.

Signed-off-by: Jing Min Zhao <zhaojingmin@vivecode.com>
Signed-off-by: Patrick McHardy <kaber@trash.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
17 years ago[NETFILTER]: nf_conntrack_h323: fix get_h225_addr() for IPv6 address access
Jing Min Zhao [Thu, 24 May 2007 23:43:07 +0000 (16:43 -0700)]
[NETFILTER]: nf_conntrack_h323: fix get_h225_addr() for IPv6 address access

Update get_h225_addr() to meet the changes in ASN.1 types. It was using
field ip6 to access IPv6 TransportAddress, it should be ip according the
ASN.1 definition.

Signed-off-by: Jing Min Zhao <zhaojingmin@vivecode.com>
Signed-off-by: Patrick McHardy <kaber@trash.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
17 years ago[NETFILTER]: nf_conntrack_h323: fix ASN.1 types
Jing Min Zhao [Thu, 24 May 2007 23:42:26 +0000 (16:42 -0700)]
[NETFILTER]: nf_conntrack_h323: fix ASN.1 types

1. Add support for decoding IPv6 address. I know it was manually added in
   the header file, but not in the template file. That wouldn't work.
2. Add missing support for decoding T.120 address in OLCA.
3. Remove unnecessary decoding of Information signal.

Signed-off-by: Jing Min Zhao <zhaojingmin@vivecode.com>
Signed-off-by: Patrick McHardy <kaber@trash.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
17 years ago[NETFILTER]: nf_conntrack_ftp: fix newline sequence number calculation
Patrick McHardy [Thu, 24 May 2007 23:41:50 +0000 (16:41 -0700)]
[NETFILTER]: nf_conntrack_ftp: fix newline sequence number calculation

When the packet size is changed by the FTP NAT helper, the connection
tracking helper adjusts the sequence number of the newline character
by the size difference. This is wrong because NAT sequence number
adjustment happens after helpers are called, so the unadjusted number
is compared to the already adjusted one.

Based on report by YU, Haitao <yuhaitao@tsinghua.org.cn>

Signed-off-by: Patrick McHardy <kaber@trash.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
17 years ago[NETFILTER]: nf_conntrack_ftp: fix newline sequence number update
Patrick McHardy [Thu, 24 May 2007 23:40:51 +0000 (16:40 -0700)]
[NETFILTER]: nf_conntrack_ftp: fix newline sequence number update

When trying to locate the oldest entry in the history of newline character
sequence numbers, the sequence number of the current entry is incorrectly
compared with the index of the oldest sequence number instead of the number
itself.

Additionally it is not made sure that the current sequence number really
is after the oldest known one.

Based on report by YU, Haitao <yuhaitao@tsinghua.org.cn>

Signed-off-by: Patrick McHardy <kaber@trash.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
17 years ago[NET_SCHED]: sch_htb: fix event cache time calculation
Patrick McHardy [Thu, 24 May 2007 06:39:54 +0000 (23:39 -0700)]
[NET_SCHED]: sch_htb: fix event cache time calculation

The event cache time must be an absolute value, when no event exists
it is incorrectly set to 1s instead of 1s in the future.

Signed-off-by: Patrick McHardy <kaber@trash.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
17 years ago[DCCP]: Fix build warning when debugging is disabled.
David S. Miller [Thu, 24 May 2007 00:43:11 +0000 (17:43 -0700)]
[DCCP]: Fix build warning when debugging is disabled.

Signed-off-by: David S. Miller <davem@davemloft.net>
17 years ago[TIPC]: Fixed erroneous introduction of for_each_netdev
Jon Paul Maloy [Wed, 23 May 2007 22:11:15 +0000 (15:11 -0700)]
[TIPC]: Fixed erroneous introduction of for_each_netdev

Signed-off-by: Jon Paul Maloy <jon.maloy@ericsson.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
17 years ago[RTNETLINK]: Fix sending netlink message when replace route.
Milan Kocian [Wed, 23 May 2007 21:55:06 +0000 (14:55 -0700)]
[RTNETLINK]: Fix sending netlink message when replace route.

When you replace route via ip r r command the netlink multicast message is
not send.  This patch corrects it.  NL message is sent with NLM_F_REPLACE
flag.

Addresses http://bugzilla.kernel.org/show_bug.cgi?id=8320

Signed-off-by: Milan Kocian <milon@wq.cz>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
17 years ago[TR]: Use menuconfig objects.
Jan Engelhardt [Wed, 23 May 2007 21:51:07 +0000 (14:51 -0700)]
[TR]: Use menuconfig objects.

Use menuconfigs instead of menus, so the whole menu can be disabled at
once instead of going through all options.

Signed-off-by: Jan Engelhardt <jengelh@gmx.de>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
17 years ago[ARCNET]: Use menuconfig objects.
Jan Engelhardt [Wed, 23 May 2007 21:50:18 +0000 (14:50 -0700)]
[ARCNET]: Use menuconfig objects.

Use menuconfigs instead of menus, so the whole menu can be disabled at
once instead of going through all options.

Signed-off-by: Jan Engelhardt <jengelh@gmx.de>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
17 years ago[TIPC]: Use menuconfig objects.
Jan Engelhardt [Wed, 23 May 2007 21:49:38 +0000 (14:49 -0700)]
[TIPC]: Use menuconfig objects.

Use menuconfigs instead of menus, so the whole menu can be disabled at
once instead of going through all options.

Signed-off-by: Jan Engelhardt <jengelh@gmx.de>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
17 years ago[SCTP]: Use menuconfig objects.
Jan Engelhardt [Wed, 23 May 2007 21:48:57 +0000 (14:48 -0700)]
[SCTP]: Use menuconfig objects.

Use menuconfigs instead of menus, so the whole menu can be disabled at
once instead of going through all options.

Signed-off-by: Jan Engelhardt <jengelh@gmx.de>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
17 years ago[IPVS]: Use menuconfig objects.
Jan Engelhardt [Wed, 23 May 2007 21:48:10 +0000 (14:48 -0700)]
[IPVS]: Use menuconfig objects.

Use menuconfigs instead of menus, so the whole menu can be disabled at once
instead of going through all options.

Signed-off-by: Jan Engelhardt <jengelh@gmx.de>
Acked-by: Simon Horman <horms@verge.net.au>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
17 years ago[DCCP]: Use menuconfig objects.
Jan Engelhardt [Wed, 23 May 2007 21:46:35 +0000 (14:46 -0700)]
[DCCP]: Use menuconfig objects.

Use menuconfigs instead of menus, so the whole menu can be disabled at
once instead of going through all options.

Signed-off-by: Jan Engelhardt <jengelh@gmx.de>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
17 years ago[ATM]: Use mutex instead of binary semaphore in idt77252 driver.
Matthias Kaehlcke [Wed, 23 May 2007 21:45:45 +0000 (14:45 -0700)]
[ATM]: Use mutex instead of binary semaphore in idt77252 driver.

Use mutex instead of binary semaphore in idt77252 driver.

Signed-off-by: Matthias Kaehlcke <matthias.kaehlcke@gmail.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
17 years ago[IPV6]: Ignore ipv6 events on non-IPV6 capable devices.
Oliver Hartkopp [Wed, 23 May 2007 21:35:31 +0000 (14:35 -0700)]
[IPV6]: Ignore ipv6 events on non-IPV6 capable devices.

Signed-off-by: Oliver Hartkopp <socketcan@hartkopp.net>
Signed-off-by: Urs Thuermann <urs@isnogud.escape.de>
Signed-off-by: David S. Miller <davem@davemloft.net>
17 years ago[NET_SCHED]: Fix qdisc_restart return value when dequeue is empty
Herbert Xu [Wed, 23 May 2007 21:30:44 +0000 (14:30 -0700)]
[NET_SCHED]: Fix qdisc_restart return value when dequeue is empty

My previous patch that changed the return value of qdisc_restart
incorrectly made the case where dequeue returns empty continue
processing packets.

This patch is based on diagnosis and fix by Patrick McHardy.

Reported-and-debugged-by: Anant Nitya <kernel@prachanda.info>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: David S. Miller <davem@davemloft.net>
17 years agoMerge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik...
Linus Torvalds [Thu, 24 May 2007 22:54:17 +0000 (15:54 -0700)]
Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6

* 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6:
  forcedeth: fix cpu irq mask
  chelsio parenthesis fix
  spidernet: skb used after netif_receive_skb
  meth driver renovation
  remove unnecessary dependency on VIA velocity config
  fix compiler warning in fixed.c
  asix.c - Add Belkin F5D5055 ids
  ucc_geth:trivial fix
  ucc_geth: Fix MODULE_DEVICE_TABLE() duplication
  [PATCH] drivers/net/wireless/libertas/rx.c: fix use-after-free
  [PATCH] drivers/net/wireless/libertas/fw.c: fix use-before-check
  [PATCH] libertas: skb dereferenced after netif_rx

17 years agoforcedeth: fix cpu irq mask
Ayaz Abdulla [Tue, 22 May 2007 00:23:11 +0000 (20:23 -0400)]
forcedeth: fix cpu irq mask

This patch fixes the cpu irq mask define to include the timer irq.
Another flag check was setting up the timer bit in all cases so we
didn't notice the issue.

Signed-off-by: Ayaz Abdulla <aabdulla@nvidia.com>
Signed-off-by: Jeff Garzik <jeff@garzik.org>
17 years agochelsio parenthesis fix
Mariusz Kozlowski [Thu, 24 May 2007 17:46:14 +0000 (19:46 +0200)]
chelsio parenthesis fix

Hello,

Balanance parenthesis in chelsio header file.

Signed-off-by: Mariusz Kozlowski <m.kozlowski@tuxland.pl>
 drivers/net/chelsio/suni1x10gexp_regs.h |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
Signed-off-by: Jeff Garzik <jeff@garzik.org>
17 years agospidernet: skb used after netif_receive_skb
Florin Malita [Tue, 22 May 2007 23:09:42 +0000 (18:09 -0500)]
spidernet: skb used after netif_receive_skb

The stats update code in spider_net_pass_skb_up() is touching the skb
after it's been passed up to the stack. To avoid that, just update the
stats first.

Signed-off-by: Florin Malita <fmalita@gmail.com>
Signed-off-by: Linas Vepstas <linas@austin.ibm.com>
Signed-off-by: Jeff Garzik <jeff@garzik.org>
17 years agometh driver renovation
Ralf Baechle [Thu, 24 May 2007 11:54:04 +0000 (12:54 +0100)]
meth driver renovation

The meth ethernet driver for the SGI IP32 aka O2 is so far still an old
style driver which does not use the device driver model.  This is now
causing issues with some udev based gadgetry in debian-stable.  Fixed by
converting the meth driver to a platform device.

Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
--
Fixes since previous patch:

  o Fixed typo in meth_exit_module()
Signed-off-by: Jeff Garzik <jeff@garzik.org>
17 years agoremove unnecessary dependency on VIA velocity config
Yoichi Yuasa [Thu, 24 May 2007 07:12:27 +0000 (16:12 +0900)]
remove unnecessary dependency on VIA velocity config

Hi,

This patch has removed unnecessary dependency on VIA velocity config.

Yoichi

Signed-off-by: Yoichi Yuasa <yoichi_yuasa@tripeaks.co.jp>
Signed-off-by: Jeff Garzik <jeff@garzik.org>
17 years agofix compiler warning in fixed.c
Denver Gingerich [Wed, 23 May 2007 21:34:43 +0000 (14:34 -0700)]
fix compiler warning in fixed.c

Correct the following compiler warning (and warnings resulting from
the correction):
warning: 'fixed_mdio_register_device' defined but not used

Signed-off-by: Denver Gingerich <denver@ossguy.com>
Cc: Vitaly Bordug <vbordug@ru.mvista.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Jeff Garzik <jeff@garzik.org>
17 years agoasix.c - Add Belkin F5D5055 ids
David Hollis [Wed, 23 May 2007 11:33:17 +0000 (07:33 -0400)]
asix.c - Add Belkin F5D5055 ids

(Originally sent to linux-usb-devel)

The attached patch adds the device IDs for the Belkin F5D5055 device.

Reported by Andy Juniper <ajuniper@freeuk.com>

Signed-off-by: David Hollis <dhollis@davehollis.com>
--
David Hollis <dhollis@davehollis.com>
Signed-off-by: Jeff Garzik <jeff@garzik.org>
17 years agoucc_geth:trivial fix
Li Yang [Tue, 22 May 2007 12:34:14 +0000 (20:34 +0800)]
ucc_geth:trivial fix

Remove redundant includes.

Signed-off-by: Li Yang <leoli@freescale.com>
Signed-off-by: Jeff Garzik <jeff@garzik.org>