forge/linux-pinenote
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

r8169: use the broken_parity_status field in pci_dev

Browse source 
The former option is removed and platform code can now specify the
expected behavior.

Signed-off-by: Lennert Buytenhek <buytenh@wantstofly.org>
Signed-off-by: Francois Romieu <romieu@fr.zoreil.com>
Signed-off-by: Jeff Garzik <jeff@garzik.org>
This commit is contained in:
Francois Romieu 2006-12-18 00:04:19 +01:00 • committed by Jeff Garzik
parent d15e9c4d9a
commit a27993f3d9
1 changed files with 1 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

5
drivers/net/r8169.c
View file

@ -225,7 +225,6 @@ MODULE_DEVICE_TABLE(pci, rtl8169_pci_tbl);
static int rx_copybreak = 200; static int rx_copybreak = 200;
static int use_dac; static int use_dac;
static int ignore_parity_err;
static struct { static struct {
u32 msg_enable; u32 msg_enable;
} debug = { -1 }; } debug = { -1 };
@ -471,8 +470,6 @@ module_param(use_dac, int, 0);
MODULE_PARM_DESC(use_dac, "Enable PCI DAC. Unsafe on 32 bit PCI slot."); MODULE_PARM_DESC(use_dac, "Enable PCI DAC. Unsafe on 32 bit PCI slot.");
module_param_named(debug, debug.msg_enable, int, 0); module_param_named(debug, debug.msg_enable, int, 0);
MODULE_PARM_DESC(debug, "Debug verbosity level (0=none, ..., 16=all)"); MODULE_PARM_DESC(debug, "Debug verbosity level (0=none, ..., 16=all)");
module_param_named(ignore_parity_err, ignore_parity_err, bool, 0);
MODULE_PARM_DESC(ignore_parity_err, "Ignore PCI parity error as target. Default: false");
MODULE_LICENSE("GPL"); MODULE_LICENSE("GPL");
MODULE_VERSION(RTL8169_VERSION); MODULE_VERSION(RTL8169_VERSION);
@ -2388,7 +2385,7 @@ static void rtl8169_pcierr_interrupt(struct net_device *dev)
* *
* Feel free to adjust to your needs. * Feel free to adjust to your needs.
*/ */
if (ignore_parity_err) if (pdev->broken_parity_status)
pci_cmd &= ~PCI_COMMAND_PARITY; pci_cmd &= ~PCI_COMMAND_PARITY;
else else
pci_cmd |= PCI_COMMAND_SERR | PCI_COMMAND_PARITY; pci_cmd |= PCI_COMMAND_SERR | PCI_COMMAND_PARITY;