[patch 23/45] forcedeth: mac address mcp77/79

Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]

From: Greg KH

Subject: [patch 23/45] forcedeth: mac address mcp77/79

Date: Thursday, February 7, 2008 - 1:47 pm

2.6.24-stable review patch.  If anyone has any objections, please let us know.

------------------
From: Ayaz Abdulla <aabdulla@nvidia.com>

patch 2b91213064bd882c3adf35f028c6d12fab3269ec in mainline.

This patch is a critical fix for MCP77 and MCP79 devices. The feature
flags were missing the define for correct mac address
(DEV_HAS_CORRECT_MACADDR).

Signed-off-by: Ayaz Abdulla <aabdulla@nvidia.com>
Signed-off-by: Jeff Garzik <jeff@garzik.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

---
 drivers/net/forcedeth.c |   16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

--- a/drivers/net/forcedeth.c
+++ b/drivers/net/forcedeth.c
@@ -5593,35 +5593,35 @@ static struct pci_device_id pci_tbl[] = 
 	},
 	{	/* MCP77 Ethernet Controller */
 		PCI_DEVICE(PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_NVENET_32),
-		.driver_data = DEV_NEED_TIMERIRQ|DEV_NEED_LINKTIMER|DEV_HAS_CHECKSUM|DEV_HAS_HIGH_DMA|DEV_HAS_MSI|DEV_HAS_POWER_CNTRL|DEV_HAS_PAUSEFRAME_TX|DEV_HAS_STATISTICS_V2|DEV_HAS_TEST_EXTENDED|DEV_HAS_MGMT_UNIT,
+		.driver_data = DEV_NEED_TIMERIRQ|DEV_NEED_LINKTIMER|DEV_HAS_CHECKSUM|DEV_HAS_HIGH_DMA|DEV_HAS_MSI|DEV_HAS_POWER_CNTRL|DEV_HAS_PAUSEFRAME_TX|DEV_HAS_STATISTICS_V2|DEV_HAS_TEST_EXTENDED|DEV_HAS_MGMT_UNIT|DEV_HAS_CORRECT_MACADDR,
 	},
 	{	/* MCP77 Ethernet Controller */
 		PCI_DEVICE(PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_NVENET_33),
-		.driver_data = DEV_NEED_TIMERIRQ|DEV_NEED_LINKTIMER|DEV_HAS_CHECKSUM|DEV_HAS_HIGH_DMA|DEV_HAS_MSI|DEV_HAS_POWER_CNTRL|DEV_HAS_PAUSEFRAME_TX|DEV_HAS_STATISTICS_V2|DEV_HAS_TEST_EXTENDED|DEV_HAS_MGMT_UNIT,
+		.driver_data = DEV_NEED_TIMERIRQ|DEV_NEED_LINKTIMER|DEV_HAS_CHECKSUM|DEV_HAS_HIGH_DMA|DEV_HAS_MSI|DEV_HAS_POWER_CNTRL|DEV_HAS_PAUSEFRAME_TX|DEV_HAS_STATISTICS_V2|DEV_HAS_TEST_EXTENDED|DEV_HAS_MGMT_UNIT|DEV_HAS_CORRECT_MACADDR,
 	},
 	{	/* MCP77 Ethernet Controller */
 		PCI_DEVICE(PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_NVENET_34),
-		.driver_data = DEV_NEED_TIMERIRQ|DEV_NEED_LINKTIMER|DEV_HAS_CHECKSUM|DEV_HAS_HIGH_DMA|DEV_HAS_MSI|DEV_HAS_POWER_CNTRL|DEV_HAS_PAUSEFRAME_TX|DEV_HAS_STATISTICS_V2|DEV_HAS_TEST_EXTENDED|DEV_HAS_MGMT_UNIT,
+		.driver_data = DEV_NEED_TIMERIRQ|DEV_NEED_LINKTIMER|DEV_HAS_CHECKSUM|DEV_HAS_HIGH_DMA|DEV_HAS_MSI|DEV_HAS_POWER_CNTRL|DEV_HAS_PAUSEFRAME_TX|DEV_HAS_STATISTICS_V2|DEV_HAS_TEST_EXTENDED|DEV_HAS_MGMT_UNIT|DEV_HAS_CORRECT_MACADDR,
 	},
 	{	/* MCP77 Ethernet Controller */
 		PCI_DEVICE(PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_NVENET_35),
-		.driver_data = DEV_NEED_TIMERIRQ|DEV_NEED_LINKTIMER|DEV_HAS_CHECKSUM|DEV_HAS_HIGH_DMA|DEV_HAS_MSI|DEV_HAS_POWER_CNTRL|DEV_HAS_PAUSEFRAME_TX|DEV_HAS_STATISTICS_V2|DEV_HAS_TEST_EXTENDED|DEV_HAS_MGMT_UNIT,
+		.driver_data = DEV_NEED_TIMERIRQ|DEV_NEED_LINKTIMER|DEV_HAS_CHECKSUM|DEV_HAS_HIGH_DMA|DEV_HAS_MSI|DEV_HAS_POWER_CNTRL|DEV_HAS_PAUSEFRAME_TX|DEV_HAS_STATISTICS_V2|DEV_HAS_TEST_EXTENDED|DEV_HAS_MGMT_UNIT|DEV_HAS_CORRECT_MACADDR,
 	},
 	{	/* MCP79 Ethernet Controller */
 		PCI_DEVICE(PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_NVENET_36),
-		.driver_data = DEV_NEED_TIMERIRQ|DEV_NEED_LINKTIMER|DEV_HAS_CHECKSUM|DEV_HAS_HIGH_DMA|DEV_HAS_MSI|DEV_HAS_POWER_CNTRL|DEV_HAS_PAUSEFRAME_TX|DEV_HAS_STATISTICS_V2|DEV_HAS_TEST_EXTENDED|DEV_HAS_MGMT_UNIT,
+		.driver_data = DEV_NEED_TIMERIRQ|DEV_NEED_LINKTIMER|DEV_HAS_CHECKSUM|DEV_HAS_HIGH_DMA|DEV_HAS_MSI|DEV_HAS_POWER_CNTRL|DEV_HAS_PAUSEFRAME_TX|DEV_HAS_STATISTICS_V2|DEV_HAS_TEST_EXTENDED|DEV_HAS_MGMT_UNIT|DEV_HAS_CORRECT_MACADDR,
 	},
 	{	/* MCP79 Ethernet Controller */
 		PCI_DEVICE(PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_NVENET_37),
-		.driver_data = DEV_NEED_TIMERIRQ|DEV_NEED_LINKTIMER|DEV_HAS_CHECKSUM|DEV_HAS_HIGH_DMA|DEV_HAS_MSI|DEV_HAS_POWER_CNTRL|DEV_HAS_PAUSEFRAME_TX|DEV_HAS_STATISTICS_V2|DEV_HAS_TEST_EXTENDED|DEV_HAS_MGMT_UNIT,
+		.driver_data = DEV_NEED_TIMERIRQ|DEV_NEED_LINKTIMER|DEV_HAS_CHECKSUM|DEV_HAS_HIGH_DMA|DEV_HAS_MSI|DEV_HAS_POWER_CNTRL|DEV_HAS_PAUSEFRAME_TX|DEV_HAS_STATISTICS_V2|DEV_HAS_TEST_EXTENDED|DEV_HAS_MGMT_UNIT|DEV_HAS_CORRECT_MACADDR,
 	},
 	{	/* MCP79 Ethernet Controller */
 		PCI_DEVICE(PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_NVENET_38),
-		.driver_data = DEV_NEED_TIMERIRQ|DEV_NEED_LINKTIMER|DEV_HAS_CHECKSUM|DEV_HAS_HIGH_DMA|DEV_HAS_MSI|DEV_HAS_POWER_CNTRL|DEV_HAS_PAUSEFRAME_TX|DEV_HAS_STATISTICS_V2|DEV_HAS_TEST_EXTENDED|DEV_HAS_MGMT_UNIT,
+		.driver_data = DEV_NEED_TIMERIRQ|DEV_NEED_LINKTIMER|DEV_HAS_CHECKSUM|DEV_HAS_HIGH_DMA|DEV_HAS_MSI|DEV_HAS_POWER_CNTRL|DEV_HAS_PAUSEFRAME_TX|DEV_HAS_STATISTICS_V2|DEV_HAS_TEST_EXTENDED|DEV_HAS_MGMT_UNIT|DEV_HAS_CORRECT_MACADDR,
 	},
 	{	/* MCP79 Ethernet Controller */
 		PCI_DEVICE(PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_NVENET_39),
-		.driver_data = DEV_NEED_TIMERIRQ|DEV_NEED_LINKTIMER|DEV_HAS_CHECKSUM|DEV_HAS_HIGH_DMA|DEV_HAS_MSI|DEV_HAS_POWER_CNTRL|DEV_HAS_PAUSEFRAME_TX|DEV_HAS_STATISTICS_V2|DEV_HAS_TEST_EXTENDED|DEV_HAS_MGMT_UNIT,
+		.driver_data = DEV_NEED_TIMERIRQ|DEV_NEED_LINKTIMER|DEV_HAS_CHECKSUM|DEV_HAS_HIGH_DMA|DEV_HAS_MSI|DEV_HAS_POWER_CNTRL|DEV_HAS_PAUSEFRAME_TX|DEV_HAS_STATISTICS_V2|DEV_HAS_TEST_EXTENDED|DEV_HAS_MGMT_UNIT|DEV_HAS_CORRECT_MACADDR,
 	},
 	{0,},
 };

-- 
--
unsubscribe noticeTo unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]

Messages in current thread:

[patch 00/45] 2.6.24-stable review, Greg KH, (Thu Feb 7, 1:45 pm)

[patch 01/45] DVB: cx23885: add missing subsystem ID for H ..., Greg KH, (Thu Feb 7, 1:46 pm)

[patch 02/45] slab: fix bootstrap on memoryless node, Greg KH, (Thu Feb 7, 1:46 pm)

[patch 03/45] vm audit: add VM_DONTEXPAND to mmap for driv ..., Greg KH, (Thu Feb 7, 1:46 pm)

[patch 04/45] USB: keyspan: Fix oops, Greg KH, (Thu Feb 7, 1:46 pm)

[patch 05/45] usb gadget: fix fsl_usb2_udc potential OOPS, Greg KH, (Thu Feb 7, 1:46 pm)

[patch 06/45] USB: CP2101 New Device IDs, Greg KH, (Thu Feb 7, 1:46 pm)

[patch 07/45] USB: add support for 4348:5523 WinChipHead U ..., Greg KH, (Thu Feb 7, 1:46 pm)

[patch 08/45] USB: Sierra - Add support for Aircard 881U, Greg KH, (Thu Feb 7, 1:46 pm)

[patch 09/45] USB: Adding YC Cable USB Serial device to pl2303, Greg KH, (Thu Feb 7, 1:46 pm)

[patch 10/45] USB: sierra driver - add devices, Greg KH, (Thu Feb 7, 1:47 pm)

[patch 11/45] USB: ftdi_sio - enabling multiple ELV device ..., Greg KH, (Thu Feb 7, 1:47 pm)

[patch 12/45] USB: ftdi-sio: Patch to add vendor/device id ..., Greg KH, (Thu Feb 7, 1:47 pm)

[patch 13/45] USB: sierra: add support for Onda H600/Zte M ..., Greg KH, (Thu Feb 7, 1:47 pm)

[patch 14/45] USB: remove duplicate entry in Option driver ..., Greg KH, (Thu Feb 7, 1:47 pm)

[patch 15/45] USB: pl2303: add support for RATOC REX-USB60F, Greg KH, (Thu Feb 7, 1:47 pm)

[patch 16/45] USB: ftdi driver - add support for optical p ..., Greg KH, (Thu Feb 7, 1:47 pm)

[patch 17/45] USB: use GFP_NOIO in reset path, Greg KH, (Thu Feb 7, 1:47 pm)

[patch 18/45] USB: Variant of the Dell Wireless 5520 driver, Greg KH, (Thu Feb 7, 1:47 pm)

[patch 19/45] USB: storage: Add unusual_dev for HP r707, Greg KH, (Thu Feb 7, 1:47 pm)

[patch 20/45] USB: fix usbtest halt check on big endian sy ..., Greg KH, (Thu Feb 7, 1:47 pm)

[patch 21/45] USB: handle idVendor of 0x0000, Greg KH, (Thu Feb 7, 1:47 pm)

[patch 22/45] USB: Fix usb_serial_driver structure for Kob ..., Greg KH, (Thu Feb 7, 1:47 pm)

[patch 23/45] forcedeth: mac address mcp77/79, Greg KH, (Thu Feb 7, 1:47 pm)

[patch 24/45] lockdep: annotate epoll, Greg KH, (Thu Feb 7, 1:47 pm)

[patch 25/45] sys_remap_file_pages: fix ->vm_file accounting, Greg KH, (Thu Feb 7, 1:47 pm)

[patch 26/45] PCI: Fix fakephp deadlock, Greg KH, (Thu Feb 7, 1:47 pm)

[patch 27/45] ACPI: update ACPI blacklist, Greg KH, (Thu Feb 7, 1:47 pm)

[patch 28/45] x86: restore correct module name for apm, Greg KH, (Thu Feb 7, 1:47 pm)

[patch 29/45] sky2: restore multicast addresses after recovery, Greg KH, (Thu Feb 7, 1:47 pm)

[patch 30/45] sky2: fix for WOL on some devices, Greg KH, (Thu Feb 7, 1:47 pm)

[patch 31/45] b43: Fix suspend/resume, Greg KH, (Thu Feb 7, 1:47 pm)

[patch 32/45] b43: Drop packets we are not able to encrypt, Greg KH, (Thu Feb 7, 1:47 pm)

[patch 33/45] b43: Fix dma-slot resource leakage, Greg KH, (Thu Feb 7, 1:47 pm)

[patch 34/45] b43legacy: fix PIO crash, Greg KH, (Thu Feb 7, 1:47 pm)

[patch 35/45] b43legacy: fix suspend/resume, Greg KH, (Thu Feb 7, 1:48 pm)

[patch 36/45] b43legacy: drop packets we are not able to e ..., Greg KH, (Thu Feb 7, 1:48 pm)

[patch 37/45] b43legacy: fix DMA slot resource leakage, Greg KH, (Thu Feb 7, 1:48 pm)

[patch 38/45] selinux: fix labeling of /proc/net inodes, Greg KH, (Thu Feb 7, 1:48 pm)

[patch 39/45] b43: Reject new firmware early, Greg KH, (Thu Feb 7, 1:48 pm)

[patch 40/45] sched: let +nice tasks have smaller impact, Greg KH, (Thu Feb 7, 1:48 pm)

[patch 41/45] sched: fix high wake up latencies with FAIR_ ..., Greg KH, (Thu Feb 7, 1:48 pm)

[patch 42/45] fix writev regression: pan hanging unkillabl ..., Greg KH, (Thu Feb 7, 1:48 pm)

[patch 43/45] x86: replace LOCK_PREFIX in futex.h, Greg KH, (Thu Feb 7, 1:48 pm)

[patch 44/45] Driver core: Revert "Fix Firmware class name ..., Greg KH, (Thu Feb 7, 1:48 pm)

[patch 45/45] drm: the drm really should call pci_set_master.., Greg KH, (Thu Feb 7, 1:48 pm)

Re: [patch 00/45] 2.6.24-stable review, S.Çağlar, (Thu Feb 7, 2:41 pm)

Re: [patch 00/45] 2.6.24-stable review, Greg KH, (Thu Feb 7, 2:58 pm)

Re: [patch 00/45] 2.6.24-stable review, Chuck Ebbert, (Thu Feb 7, 4:50 pm)

Re: [patch 00/45] 2.6.24-stable review, David Chinner, (Thu Feb 7, 5:44 pm)

Re: [stable] [patch 00/45] 2.6.24-stable review, Greg KH, (Thu Feb 7, 6:12 pm)

Re: [stable] [patch 00/45] 2.6.24-stable review, David Chinner, (Thu Feb 7, 6:24 pm)

Re: [stable] [patch 00/45] 2.6.24-stable review, Greg KH, (Thu Feb 7, 6:32 pm)

Re: [stable] [patch 00/45] 2.6.24-stable review, Greg KH, (Thu Feb 7, 6:35 pm)

RE: [patch 13/45] USB: sierra: add support for Onda H600/Z ..., Kevin Lloyd, (Thu Feb 7, 7:21 pm)

Re: [patch 13/45] USB: sierra: add support for Onda H600/Z ..., Greg KH, (Thu Feb 7, 9:11 pm)

Re: [stable] [patch 00/45] 2.6.24-stable review, Greg KH, (Thu Feb 7, 10:31 pm)

RE: [patch 13/45] USB: sierra: add support for Onda H600/Z ..., Kevin Lloyd, (Fri Feb 8, 9:50 am)

Re: [patch 43/45] x86: replace LOCK_PREFIX in futex.h, Stefan Lippers-Hollmann, (Fri Feb 8, 11:35 am)

Re: [patch 13/45] USB: sierra: add support for Onda H600/Z ..., Greg KH, (Fri Feb 8, 11:47 am)

Re: [patch 43/45] x86: replace LOCK_PREFIX in futex.h, Greg KH, (Fri Feb 8, 12:19 pm)

Re: [patch 43/45] x86: replace LOCK_PREFIX in futex.h, Chuck Ebbert, (Fri Feb 8, 2:45 pm)

[PATCH] stable_kernel_rules: fix must already be in mainline, Stefan Richter, (Fri Feb 8, 3:26 pm)

Re: [stable] [patch 00/45] 2.6.24-stable review, Greg KH, (Fri Feb 8, 5:57 pm)


linux-kernel:
Fortier,Vincent [Montreal]	2.6.21.5 june 30th to july 1st date hang?
Jeff Dike	[ PATCH 2/6 ] UML - Formatting fixes around os_{read_write}_file callers
Liam Girdwood	[PATCH 07/13] regulator: regulator test harness
Oleg Nesterov	Re: Getting the new RxRPC patches upstream
Stefan Seyfried	Re: 2.6.19-rc5: grub is much slower resuming from suspend-to-disk than in 2.6.18
linux-netdev:
Arnaud Ebalard	Re: [REGRESSION,BISECTED] MIPv6 support broken by f4f914b58019f0
Jan Engelhardt	Re: [PATCH iptables] extension: add xt_cpu match
Jarek Poplawski	Re: [PATCH] pkt_sched: Destroy gen estimators under rtnl_lock().
Sebastian Andrzej Siewior	[PATCH 8/8] net/emergency: remove locking from reycling pool if emergncy pools are...
David Miller	Re: [PATCH] qlcnic: dont assume NET_IP_ALIGN is 2
git:
Jakub Narebski	Re: git on MacOSX and files with decomposed utf-8 file names
Brandon Casey	Re: Thunderbird and patches (was Re: [PATCH v2] Enable setting attach as the def...
Christian Couder	[PATCH 1/3] rev-parse: add test script for "--verify"
Ramkumar Ramachandra	Re: [GSoC update] git-remote-svn: The final one
Junio C Hamano	Re: git-rm isn't the inverse action of git-add
openbsd-misc:
Joachim Schipper	Re: UVC Webcams
Florin Andrei	SOLVED [was: firewall is very slow, something's wrong]
Todd Alan Smith	Re: Microsoft gets the Most Secure Operating Systems award
Neal Hogan	Re: Need Advice: Thinkpad T60 or T61?
Sam Fourman Jr.	Re: Real men don't attack straw men
git-commits-head:
Linux Kernel Mailing List	ACPI: Disable ARB_DISABLE on platforms where it is not needed
Linux Kernel Mailing List	m68knommu: add read_barrier_depends() and irqs_disabled_flags()
Linux Kernel Mailing List	[MTD] Add mtd panic_write function pointer
Linux Kernel Mailing List	[ARM] pxa: remove duplicate select statements from Kconfig
Linux Kernel Mailing List	mlx4_core: Don't read reserved fields in mlx4_QUERY_ADAPTER()