[PATCH] forcedeth: add two new pci ids (9992d4aa) · Commits · e / devices / android_kernel_teracube_emerald

drivers/net/forcedeth.c

+19 −2

Original line number	Original line	Diff line number	Diff line
	@@ -82,6 +82,7 @@
	* 0.31: 14 Nov 2004: ethtool support for getting/setting link		* 0.31: 14 Nov 2004: ethtool support for getting/setting link
	* capabilities.		* capabilities.
	* 0.32: 16 Apr 2005: RX_ERROR4 handling added.		* 0.32: 16 Apr 2005: RX_ERROR4 handling added.
			* 0.33: 16 Mai 2005: Support for MCP51 added.
	*		*
	* Known bugs:		* Known bugs:
	* We suspect that on some hardware no TX done interrupts are generated.		* We suspect that on some hardware no TX done interrupts are generated.
	@@ -93,7 +94,7 @@
	* DEV_NEED_TIMERIRQ will not harm you on sane hardware, only generating a few		* DEV_NEED_TIMERIRQ will not harm you on sane hardware, only generating a few
	* superfluous timer interrupts from the nic.		* superfluous timer interrupts from the nic.
	*/		*/
	#define FORCEDETH_VERSION "0.32"		#define FORCEDETH_VERSION "0.33"
	#define DRV_NAME "forcedeth"		#define DRV_NAME "forcedeth"

	#include <linux/module.h>		#include <linux/module.h>
	@@ -2005,7 +2006,9 @@ static int __devinit nv_probe(struct pci_dev *pci_dev, const struct pci_device_i
	/* handle different descriptor versions */		/* handle different descriptor versions */
	if (pci_dev->device == PCI_DEVICE_ID_NVIDIA_NVENET_1 \|\|		if (pci_dev->device == PCI_DEVICE_ID_NVIDIA_NVENET_1 \|\|
	pci_dev->device == PCI_DEVICE_ID_NVIDIA_NVENET_2 \|\|		pci_dev->device == PCI_DEVICE_ID_NVIDIA_NVENET_2 \|\|
	pci_dev->device == PCI_DEVICE_ID_NVIDIA_NVENET_3)		pci_dev->device == PCI_DEVICE_ID_NVIDIA_NVENET_3 \|\|
			pci_dev->device == PCI_DEVICE_ID_NVIDIA_NVENET_12 \|\|
			pci_dev->device == PCI_DEVICE_ID_NVIDIA_NVENET_13)
	np->desc_ver = DESC_VER_1;		np->desc_ver = DESC_VER_1;
	else		else
	np->desc_ver = DESC_VER_2;		np->desc_ver = DESC_VER_2;
	@@ -2266,6 +2269,20 @@ static struct pci_device_id pci_tbl[] = {
	.subdevice = PCI_ANY_ID,		.subdevice = PCI_ANY_ID,
	.driver_data = DEV_NEED_LASTPACKET1\|DEV_IRQMASK_2\|DEV_NEED_TIMERIRQ,		.driver_data = DEV_NEED_LASTPACKET1\|DEV_IRQMASK_2\|DEV_NEED_TIMERIRQ,
	},		},
			{ /* MCP51 Ethernet Controller */
			.vendor = PCI_VENDOR_ID_NVIDIA,
			.device = PCI_DEVICE_ID_NVIDIA_NVENET_12,
			.subvendor = PCI_ANY_ID,
			.subdevice = PCI_ANY_ID,
			.driver_data = DEV_NEED_LASTPACKET1\|DEV_IRQMASK_2\|DEV_NEED_TIMERIRQ,
			},
			{ /* MCP51 Ethernet Controller */
			.vendor = PCI_VENDOR_ID_NVIDIA,
			.device = PCI_DEVICE_ID_NVIDIA_NVENET_13,
			.subvendor = PCI_ANY_ID,
			.subdevice = PCI_ANY_ID,
			.driver_data = DEV_NEED_LASTPACKET1\|DEV_IRQMASK_2\|DEV_NEED_TIMERIRQ,
			},
	{0,},		{0,},
	};		};