rpms/kernel/devel linux-2.6-firewire-use-device-orb-timeout.patch, 1.1, 1.2

[Jarod Wilson (jwilson)]

Author: jwilson

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

Modified Files:
	linux-2.6-firewire-use-device-orb-timeout.patch 
Log Message:
Oops. Left out a chunk of the patch when porting...

linux-2.6-firewire-use-device-orb-timeout.patch:

Index: linux-2.6-firewire-use-device-orb-timeout.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/linux-2.6-firewire-use-device-orb-timeout.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- linux-2.6-firewire-use-device-orb-timeout.patch	25 Jan 2008 18:07:30 -0000	1.1
+++ linux-2.6-firewire-use-device-orb-timeout.patch	25 Jan 2008 18:37:17 -0000	1.2
@@ -1,5 +1,5 @@
 diff --git a/drivers/firewire/fw-sbp2.c b/drivers/firewire/fw-sbp2.c
-index 6a5f0bb..64dd060 100644
+index 4c2485c..ac6b219 100644
 --- a/drivers/firewire/fw-sbp2.c
 +++ b/drivers/firewire/fw-sbp2.c
 @@ -148,15 +148,20 @@ struct sbp2_target {
@@ -53,9 +53,21 @@
 +		timeout = MIN(SBP2_MAX_LOGIN_ORB_TIMEOUT,
 +			      MAX(rom_timeout, SBP2_MIN_LOGIN_ORB_TIMEOUT));
 +		if (rom_timeout != timeout)
-+			fw_notify("Device config rom gave us a %ds timeout, "
-+				  "overriding to %ds\n",
++			fw_notify("Device config rom gave us a %ds management "
++				  "ORB timeout, overriding to %ds\n",
 +				  rom_timeout / 1000, timeout / 1000);
  	} else {
  		timeout = SBP2_ORB_TIMEOUT;
  	}
+@@ -798,6 +810,11 @@ static int sbp2_scan_unit_dir(struct sbp2_target *tgt, u32 *directory,
+ 			*firmware_revision = value;
+ 			break;
+ 
++		case SBP2_CSR_UNIT_CHARACTERISTICS:
++			tgt->mgt_orb_timeout = value >> 8 & 0xff;
++			tgt->orb_size = value & 0xff;
++			break;
++
+ 		case SBP2_CSR_LOGICAL_UNIT_NUMBER:
+ 			if (sbp2_add_logical_unit(tgt, value) < 0)
+ 				return -ENOMEM;