Matthew Garrett
801e147cde
r8169: Handle rxfifo errors on 8168 chips ...
The Thinkpad X100e seems to have some odd behaviour when the display is
powered off - the onboard r8169 starts generating rxfifo overflow errors.
The root cause of this has not yet been identified and may well be a
hardware design bug on the platform, but r8169 should be more resiliant to
this. This patch enables the rxfifo interrupt on 8168 devices and removes
the MAC version check in the interrupt handler, and the machine no longer
crashes when under network load while the screen turns off.
Signed-off-by: Matthew Garrett <mjg@redhat.com>
Acked-by: Francois Romieu <romieu@fr.zoreil.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
2010-09-15 19:32:59 -07:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6
2010-09-07 16:00:17 -07:00
libata-sff: remove harmful BUG_ON from ata_bmdma_qc_issue
2010-08-25 19:24:16 -04:00
Merge branch 'next-devicetree' of git://git.secretlab.ca/git/linux-2.6
2010-08-12 09:11:31 -07:00
firmware_class: fix typo in error path
2010-08-23 18:12:46 -07:00
Merge branch 'for-upstream/pvhvm' of git://xenbits.xensource.com/people/ianc/linux-2.6
2010-08-23 18:29:18 -07:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
2010-09-07 14:35:16 -07:00
[S390] zcrypt: fix Kconfig dependencies
2010-08-13 10:06:54 +02:00
Merge branch 'next-devicetree' of git://git.secretlab.ca/git/linux-2.6
2010-08-12 09:11:31 -07:00
amd64_edac: Do not report error overflow as a separate error
2010-08-26 12:46:03 +02:00
firewire: ohci: work around VIA and NEC PHY packet reception bug
2010-08-29 09:17:31 +02:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6
2010-08-14 12:34:34 -07:00
gpiolib: Implement set_debounce for WM831x GPIOs
2010-08-12 11:27:57 +02:00
Merge branch 'drm-intel-fixes' of git://anongit.freedesktop.org/~ickle/drm-intel
2010-09-07 14:00:43 -07:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid
2010-08-18 15:29:38 -07:00
hwmon: (k8temp) Differentiate between AM2 and ASB1
2010-08-25 15:42:12 +02:00
Merge branch 'for-linus/i2c-2636' of git://git.fluff.org/bjdooks/linux
2010-08-14 11:57:54 -07:00
ide: use module_param_named rather than module_param_call
2010-08-11 23:04:39 +09:30
Merge branch 'idle-release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-idle-2.6
2010-08-15 11:17:52 -07:00
Merge branch 'next-devicetree' of git://git.secretlab.ca/git/linux-2.6
2010-08-12 09:11:31 -07:00
Input: pxa27x_keypad - remove input_free_device() in pxa27x_keypad_remove()
2010-08-25 07:51:40 -07:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
2010-08-23 18:30:30 -07:00
Merge branch 'next-devicetree' of git://git.secretlab.ca/git/linux-2.6
2010-08-12 09:11:31 -07:00
via-pmu: Add compat_pmu_ioctl
2010-08-24 15:28:28 +10:00
md: resolve confusion of MD_CHANGE_CLEAN
2010-08-30 18:06:21 +10:00
V4L/DVB: mantis: Fix IR_CORE dependency
2010-08-24 10:42:08 -07:00
memstick: fix hangs on unexpected device removal in mspro_blk
2010-08-12 08:43:31 -07:00
fusion: add function parameter names to kernel-doc
2010-08-14 16:21:00 -07:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/lrg/voltage-2.6
2010-08-12 10:01:30 -07:00
Merge branch 'params' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-for-linus
2010-08-12 10:01:59 -07:00
drivers/mmc/host/sdhci-s3c.c: use the correct mutex and card detect function
2010-08-20 09:34:55 -07:00
UBI: do not oops when erroneous PEB is scheduled for scrubbing
2010-08-30 13:32:31 +03:00
r8169: Handle rxfifo errors on 8168 chips
2010-09-15 19:32:59 -07:00
Merge branch 'next-devicetree' of git://git.secretlab.ca/git/linux-2.6
2010-08-12 09:11:31 -07:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6
2010-09-07 16:00:17 -07:00
Merge branch 'next-devicetree' of git://git.secretlab.ca/git/linux-2.6
2010-08-12 09:11:31 -07:00
intel_scu_ipc: fix IPC i2c write bug
2010-08-24 10:42:09 -07:00
Merge git://git.infradead.org/battery-2.6
2010-08-12 09:58:33 -07:00
regulator: Remove default DEBUG define from TPS6586x
2010-08-11 11:38:03 +01:00
Merge branch 'next-devicetree' of git://git.secretlab.ca/git/linux-2.6
2010-08-12 09:11:31 -07:00
Input: sysrq - drop tty argument form handle_sysrq()
2010-08-21 00:34:45 -07:00
drivers/scsi/qla4xxx: fix build
2010-08-20 09:34:56 -07:00
serial: bfin_sport_uart: restore transmit frame sync fix
2010-09-03 17:29:04 -07:00
m68knommu: include sched.h in ColdFire/SPI driver
2010-08-18 12:44:31 +10:00
Staging: wlan-ng: Explicitly set some fields in cfg80211 interface
2010-09-03 17:37:16 -07:00
USB: ftdi_sio: Added custom PIDs for ChamSys products
2010-09-03 17:33:41 -07:00
vhost: error handling fix
2010-09-06 09:49:39 +03:00
matroxfb: fix incorrect use of memcpy_toio()
2010-08-20 09:34:54 -07:00
watchdog: hpwdt (12/12): Make NMI decoding a compile-time option
2010-08-13 20:54:53 +00:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
2010-08-28 13:55:31 -07:00
801e147cde