rpms/kernel/F-8 kernel.spec, 1.353, 1.354 linux-2.6-netdev-smc91c92_cs-fix-station-addr.patch, 1.1, 1.2

[Chuck Ebbert (cebbert)]

Author: cebbert

Update of /cvs/pkgs/rpms/kernel/F-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26654

Modified Files:
	kernel.spec 
	linux-2.6-netdev-smc91c92_cs-fix-station-addr.patch 
Log Message:
use the offical patch



Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-8/kernel.spec,v
retrieving revision 1.353
retrieving revision 1.354
diff -u -r1.353 -r1.354
--- kernel.spec	18 Feb 2008 21:31:42 -0000	1.353
+++ kernel.spec	20 Feb 2008 23:57:10 -0000	1.354
@@ -1260,7 +1260,7 @@
 ApplyPatch linux-2.6-netdev-atl2.patch
 # spidernet: fix interrupt handling
 # fix station address on meghertz pcmcia adpter (#233255)
-ApplyPatch linux-2.6-netdev-smc91c92_cs-fix-station-addr.patch -R
+ApplyPatch linux-2.6-netdev-smc91c92_cs-fix-station-addr.patch
 # fix null deref in bonding
 ApplyPatch linux-2.6-netdev-bonding-fix-null-deref.patch
 

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

Index: linux-2.6-netdev-smc91c92_cs-fix-station-addr.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-8/linux-2.6-netdev-smc91c92_cs-fix-station-addr.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- linux-2.6-netdev-smc91c92_cs-fix-station-addr.patch	8 Feb 2008 20:57:57 -0000	1.1
+++ linux-2.6-netdev-smc91c92_cs-fix-station-addr.patch	20 Feb 2008 23:57:10 -0000	1.2
@@ -1,21 +1,49 @@
---- a/drivers/net/pcmcia/smc91c92_cs.c	Tue Dec 05 06:09:20 2006 +0500
-+++ b/drivers/net/pcmcia/smc91c92_cs.c	Tue Dec 05 06:09:21 2006 +0500
-@@ -560,16 +560,8 @@ static int mhz_setup(struct pcmcia_devic
+Gitweb:     http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=a1a98b72dbd17e53cd92b8e78f404525ebcfd981
+Commit:     a1a98b72dbd17e53cd92b8e78f404525ebcfd981
+Parent:     4a75834644ae32ded9bed14db39834d6d3bc4793
+Author:     Chuck Ebbert <cebbert at redhat.com>
+AuthorDate: Wed Feb 13 19:47:11 2008 -0500
+Committer:  Jeff Garzik <jeff at garzik.org>
+CommitDate: Fri Feb 15 10:51:37 2008 -0500
+
+    Fix station address detection in smc
+    
+    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
+    
+    Thanks go to Jon Stanley for not giving up on this one until the
+    problem was found.
+    
+    Signed-off-by: Chuck Ebbert <cebbert at redhat.com>
+    Signed-off-by: Jeff Garzik <jeff at garzik.org>
+---
+ drivers/net/pcmcia/smc91c92_cs.c |   12 ++++++++++--
+ 1 files changed, 10 insertions(+), 2 deletions(-)
+
+diff --git a/drivers/net/pcmcia/smc91c92_cs.c b/drivers/net/pcmcia/smc91c92_cs.c
+index f18eca9..250eb19 100644
+--- a/drivers/net/pcmcia/smc91c92_cs.c
++++ b/drivers/net/pcmcia/smc91c92_cs.c
+@@ -559,8 +559,16 @@ static int mhz_setup(struct pcmcia_device *link)
  
      /* 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 (link->prod_id[3]) {
+-	station_addr = link->prod_id[3];
++    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 (cvt_ascii_address(dev, station_addr) == 0) {
  		rc = 0;
  		goto free_cfg_mem;