Commit a27993f3 authored by Francois Romieu's avatar Francois Romieu Committed by Jeff Garzik
Browse files

r8169: use the broken_parity_status field in pci_dev 



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

Signed-off-by: default avatarLennert Buytenhek <buytenh@wantstofly.org>
Signed-off-by: default avatarFrancois Romieu <romieu@fr.zoreil.com>
Signed-off-by: default avatarJeff Garzik <jeff@garzik.org>
parent d15e9c4d

drivers/net/r8169.c

+1 −4
Original line number Diff line number Diff line
@@ -225,7 +225,6 @@ MODULE_DEVICE_TABLE(pci, rtl8169_pci_tbl); 


static int rx_copybreak = 200;

static int use_dac;

static int ignore_parity_err;

static struct {

	u32 msg_enable;

} 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_param_named(debug, debug.msg_enable, int, 0);

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_VERSION(RTL8169_VERSION);
@@ -2388,7 +2385,7 @@ static void rtl8169_pcierr_interrupt(struct net_device *dev) 
	 *

	 * Feel free to adjust to your needs.

	 */

	if (ignore_parity_err)

	if (pdev->broken_parity_status)

		pci_cmd &= ~PCI_COMMAND_PARITY;

	else

		pci_cmd |= PCI_COMMAND_SERR | PCI_COMMAND_PARITY;