rpms/kernel/devel linux-2.6-netdev-smc91c92_cs-fix-station-addr.patch, NONE, 1.1 kernel.spec, 1.429, 1.430

[Chuck Ebbert (cebbert)]

Author: cebbert

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12649

Modified Files:
	kernel.spec 
Added Files:
	linux-2.6-netdev-smc91c92_cs-fix-station-addr.patch 
Log Message:
* Thu Feb 14 2008 Chuck Ebbert <cebbert at redhat.com>
- Fix broken Megahertz PCMCIA Ethernet adapter.


linux-2.6-netdev-smc91c92_cs-fix-station-addr.patch:

--- NEW FILE linux-2.6-netdev-smc91c92_cs-fix-station-addr.patch ---
Megahertz EM1144 PCMCIA ethernet adapter needs special handling
because it has two VERS_1 tuples and the station address is in
the second one. Conversion to generic handling of these fields
broke it. Reverting that fixes the device.

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

Signed-off-by: Chuck Ebbert <cebbert at redhat.com>

--- b/drivers/net/pcmcia/smc91c92_cs.c	Tue Dec 05 06:09:21 2006 +0500
+++ a/drivers/net/pcmcia/smc91c92_cs.c	Tue Dec 05 06:09:20 2006 +0500
@@ -560,8 +560,16 @@
 
     /* Read the station address from the CIS.  It is stored as the last
        (fourth) string in the Version 1 Version/ID tuple. */
+    tuple->DesiredTuple = CISTPL_VERS_1;
+    if (first_tuple(link, tuple, parse) != CS_SUCCESS) {
+	rc = -1;
+	goto free_cfg_mem;
+    }
+    /* Ugh -- the EM1144 card has two VERS_1 tuples!?! */
+    if (next_tuple(link, tuple, parse) != CS_SUCCESS)
+	first_tuple(link, tuple, parse);
+    if (parse->version_1.ns > 3) {
+	station_addr = parse->version_1.str + parse->version_1.ofs[3];
-    if (link->prod_id[3]) {
-	station_addr = link->prod_id[3];
 	if (cvt_ascii_address(dev, station_addr) == 0) {
 		rc = 0;
 		goto free_cfg_mem;


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.429
retrieving revision 1.430
diff -u -r1.429 -r1.430
--- kernel.spec	14 Feb 2008 22:41:15 -0000	1.429
+++ kernel.spec	15 Feb 2008 00:27:37 -0000	1.430
@@ -633,6 +633,9 @@
 # atl2 network driver
 Patch2020: linux-2.6-netdev-atl2.patch
 
+# fix broken pcmcia station address detection
+Patch2021: linux-2.6-netdev-smc91c92_cs-fix-station-addr.patch
+
 # ext4 patches
 Patch2100: linux-2.6-ext4-linus-git.patch
 Patch2101: linux-2.6-ext4-stable-queue.patch
@@ -1141,6 +1144,7 @@
 ApplyPatch linux-2.6-e1000-corrupt-eeprom-checksum.patch
 ApplyPatch linux-2.6-netdev-e1000-disable-alpm.patch
 ApplyPatch linux-2.6-netdev-atl2.patch
+ApplyPatch linux-2.6-netdev-smc91c92_cs-fix-station-addr.patch
 
 # Nouveau DRM + drm fixes
 ApplyPatch nouveau-drm.patch
@@ -1745,6 +1749,9 @@
 %kernel_variant_files -a /%{image_install_path}/xen*-%{KVERREL} -e /etc/ld.so.conf.d/kernelcap-%{KVERREL}.conf %{with_xen} xen
 
 %changelog
+* Thu Feb 14 2008 Chuck Ebbert <cebbert at redhat.com>
+- Fix broken Megahertz PCMCIA Ethernet adapter.
+
 * Thu Feb 14 2008 Jarod Wilson <jwilson at redhat.com>
 - Build powernow-k8 as a module