rpms/kernel/F-9 linux-2.6-netdev-e1000e-add-support-for-82567lm-4.patch, NONE, 1.1 kernel.spec, 1.759, 1.760

[Chuck Ebbert]

Author: cebbert

Update of /cvs/pkgs/rpms/kernel/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26801

Modified Files:
	kernel.spec 
Added Files:
	linux-2.6-netdev-e1000e-add-support-for-82567lm-4.patch 
Log Message:
Add support for 82567LM-4 to the e1000e driver (#461438)

linux-2.6-netdev-e1000e-add-support-for-82567lm-4.patch:

--- NEW FILE linux-2.6-netdev-e1000e-add-support-for-82567lm-4.patch ---
From: Bruce Allan <bruce.w.allan at intel.com>
Date: Wed, 27 Aug 2008 01:36:36 +0000 (-0700)
Subject: e1000e: add support for the 82567LM-4 device
X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Fdavem%2Fnet-next-2.6.git;a=commitdiff_plain;h=2f15f9d60190a62bc8ac50fa84fea31fc0b00ecf

e1000e: add support for the 82567LM-4 device

Enable PCI device ID for a new combination of MAC and PHY already supported
in the driver.

Signed-off-by: Bruce Allan <bruce.w.allan at intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher at intel.com>
Signed-off-by: Jeff Garzik <jgarzik at redhat.com>
---

https://bugzilla.redhat.com/show_bug.cgi?id=461438

diff --git a/drivers/net/e1000e/hw.h b/drivers/net/e1000e/hw.h
index 74f263a..d0e7b46 100644
--- a/drivers/net/e1000e/hw.h
+++ b/drivers/net/e1000e/hw.h
@@ -346,6 +346,7 @@ enum e1e_registers {
 #define E1000_DEV_ID_ICH8_IFE_G			0x10C5
 #define E1000_DEV_ID_ICH8_IGP_M			0x104D
 #define E1000_DEV_ID_ICH9_IGP_AMT		0x10BD
+#define E1000_DEV_ID_ICH9_BM			0x10E5
 #define E1000_DEV_ID_ICH9_IGP_M_AMT		0x10F5
 #define E1000_DEV_ID_ICH9_IGP_M			0x10BF
 #define E1000_DEV_ID_ICH9_IGP_M_V		0x10CB
diff --git a/drivers/net/e1000e/ich8lan.c b/drivers/net/e1000e/ich8lan.c
index 9e38452..b5fc2c9 100644
--- a/drivers/net/e1000e/ich8lan.c
+++ b/drivers/net/e1000e/ich8lan.c
@@ -44,6 +44,7 @@
  * 82567LF-2 Gigabit Network Connection
  * 82567V-2 Gigabit Network Connection
  * 82562GT-3 10/100 Network Connection
+ * 82567LM-4 Gigabit Network Connection
  */
 
 #include <linux/netdevice.h>
diff --git a/drivers/net/e1000e/netdev.c b/drivers/net/e1000e/netdev.c
index d266510..c3d7411 100644
--- a/drivers/net/e1000e/netdev.c
+++ b/drivers/net/e1000e/netdev.c
@@ -4767,6 +4767,7 @@ static struct pci_device_id e1000_pci_tbl[] = {
 	{ PCI_VDEVICE(INTEL, E1000_DEV_ID_ICH9_IFE_GT), board_ich9lan },
 	{ PCI_VDEVICE(INTEL, E1000_DEV_ID_ICH9_IGP_AMT), board_ich9lan },
 	{ PCI_VDEVICE(INTEL, E1000_DEV_ID_ICH9_IGP_C), board_ich9lan },
+	{ PCI_VDEVICE(INTEL, E1000_DEV_ID_ICH9_BM), board_ich9lan },
 	{ PCI_VDEVICE(INTEL, E1000_DEV_ID_ICH9_IGP_M), board_ich9lan },
 	{ PCI_VDEVICE(INTEL, E1000_DEV_ID_ICH9_IGP_M_AMT), board_ich9lan },
 	{ PCI_VDEVICE(INTEL, E1000_DEV_ID_ICH9_IGP_M_V), board_ich9lan },


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-9/kernel.spec,v
retrieving revision 1.759
retrieving revision 1.760
diff -u -r1.759 -r1.760
--- kernel.spec	9 Sep 2008 05:38:34 -0000	1.759
+++ kernel.spec	10 Sep 2008 16:41:38 -0000	1.760
@@ -668,6 +668,8 @@
 
 Patch2030: linux-2.6-net-tulip-interrupt.patch
 
+Patch2040: linux-2.6-netdev-e1000e-add-support-for-82567lm-4.patch
+
 # linux1394 git patches
 Patch2200: linux-2.6-firewire-git-update.patch
 
@@ -1223,6 +1225,8 @@
 
 ApplyPatch linux-2.6-net-tulip-interrupt.patch
 
+ApplyPatch linux-2.6-netdev-e1000e-add-support-for-82567lm-4.patch
+
 # Nouveau DRM + drm fixes
 ApplyPatch drm-fedora9-rollup.patch
 
@@ -1832,6 +1836,9 @@
 %kernel_variant_files -a /%{image_install_path}/xen*-%{KVERREL}.xen -e /etc/ld.so.conf.d/kernelcap-%{KVERREL}.xen.conf %{with_xen} xen
 
 %changelog
+* Wed Sep 10 2008 Chuck Ebbert <cebbert at redhat.com> 2.6.26.5-33
+- Add support for 82567LM-4 to the e1000e driver (#461438)
+
 * Mon Sep 08 2008 Chuck Ebbert <cebbert at redhat.com> 2.6.26.5-32
 - HPET fixes from 2.6.27