summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChuck Ebbert <cebbert@redhat.com>2011-02-02 11:21:43 -0500
committerChuck Ebbert <cebbert@redhat.com>2011-02-02 11:21:43 -0500
commitd12d7e80c24ecf07428000f4b109b0dbd6ac1edd (patch)
treeed557ca96108ed9f02dd3002d61eb522eb7b42d4
parent6dc8e998dca96a66a079cea5628c23edf4b5f59a (diff)
downloadkernel-d12d7e80c24ecf07428000f4b109b0dbd6ac1edd.tar.gz
kernel-d12d7e80c24ecf07428000f4b109b0dbd6ac1edd.tar.xz
kernel-d12d7e80c24ecf07428000f4b109b0dbd6ac1edd.zip
Fix autoload of atl1c driver for latest hardware (#607499)
-rw-r--r--atl1c-add-missing-pci-id.patch17
-rw-r--r--kernel.spec11
2 files changed, 27 insertions, 1 deletions
diff --git a/atl1c-add-missing-pci-id.patch b/atl1c-add-missing-pci-id.patch
new file mode 100644
index 000000000..236319b74
--- /dev/null
+++ b/atl1c-add-missing-pci-id.patch
@@ -0,0 +1,17 @@
+atl1c: Add missing PCI device ID
+
+Commit 8f574b35f22fbb9b5e5f1d11ad6b55b6f35f4533 added support for a new
+adapter but failed to add it to the PCI device table.
+
+Signed-Off-By: Chuck Ebbert <cebbert@redhat.com>
+
+--- vanilla-2.6.38-rc3.orig/drivers/net/atl1c/atl1c_main.c
++++ vanilla-2.6.38-rc3/drivers/net/atl1c/atl1c_main.c
+@@ -48,6 +48,7 @@ static DEFINE_PCI_DEVICE_TABLE(atl1c_pci
+ {PCI_DEVICE(PCI_VENDOR_ID_ATTANSIC, PCI_DEVICE_ID_ATHEROS_L2C_B)},
+ {PCI_DEVICE(PCI_VENDOR_ID_ATTANSIC, PCI_DEVICE_ID_ATHEROS_L2C_B2)},
+ {PCI_DEVICE(PCI_VENDOR_ID_ATTANSIC, PCI_DEVICE_ID_ATHEROS_L1D)},
++ {PCI_DEVICE(PCI_VENDOR_ID_ATTANSIC, PCI_DEVICE_ID_ATHEROS_L1D_2_0)},
+ /* required last entry */
+ { 0 }
+ };
diff --git a/kernel.spec b/kernel.spec
index da184c8b2..a2339d917 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -738,6 +738,9 @@ Patch12432: hfsplus-01-dont-leak-buffer.patch
Patch12434: hfsplus-03-zero-vhdr-on-free.patch
Patch12436: hfsplus-05-fix-failed-mount.patch
+# rhbz#607499
+Patch12437: atl1c-add-missing-pci-id.patch
+
%endif
BuildRoot: %{_tmppath}/kernel-%{KVERREL}-root
@@ -1359,6 +1362,9 @@ ApplyPatch hfsplus-01-dont-leak-buffer.patch
ApplyPatch hfsplus-03-zero-vhdr-on-free.patch
ApplyPatch hfsplus-05-fix-failed-mount.patch
+# rhbz#607499
+ApplyPatch atl1c-add-missing-pci-id.patch
+
# END OF PATCH APPLICATIONS
%endif
@@ -1971,7 +1977,10 @@ fi
# ||----w |
# || ||
%changelog
-* Mon Feb 01 2011 Chuck Ebbert <cebbert@redhat.com> 2.6.38-0.rc3.git0.1
+* Wed Feb 02 2011 Chuck Ebbert <cebbert@redhat.com>
+- Fix autoload of atl1c driver for latest hardware (#607499)
+
+* Tue Feb 01 2011 Chuck Ebbert <cebbert@redhat.com> 2.6.38-0.rc3.git0.1
- Linux 2.6.38-rc3
- Try to fix some obvious bugs in hfsplus mount failure handling (#673857)