rpms/kernel/devel linux-2.6-firewire-increase-mgt-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-serv22409

Modified Files:
	linux-2.6-firewire-increase-mgt-orb-timeout.patch 
Log Message:
Fix up description and make variable name slightly more appropriate

linux-2.6-firewire-increase-mgt-orb-timeout.patch:

Index: linux-2.6-firewire-increase-mgt-orb-timeout.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/linux-2.6-firewire-increase-mgt-orb-timeout.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- linux-2.6-firewire-increase-mgt-orb-timeout.patch	18 Jan 2008 22:03:39 -0000	1.1
+++ linux-2.6-firewire-increase-mgt-orb-timeout.patch	19 Jan 2008 03:08:24 -0000	1.2
@@ -8,32 +8,33 @@
 
 Signed-off-by: Jarod Wilson <jwilson at redhat.com>
 
- drivers/firewire/fw-sbp2.c |   16 +++++++++++++---
- 1 files changed, 13 insertions(+), 3 deletions(-)
+ drivers/firewire/fw-sbp2.c |   17 ++++++++++++++---
+ 1 files changed, 14 insertions(+), 3 deletions(-)
 
 diff --git a/drivers/firewire/fw-sbp2.c b/drivers/firewire/fw-sbp2.c
-index 9040417..1e8574e 100644
+index 9040417..ff0d2c3 100644
 --- a/drivers/firewire/fw-sbp2.c
 +++ b/drivers/firewire/fw-sbp2.c
-@@ -150,9 +150,16 @@ struct sbp2_target {
+@@ -150,9 +150,17 @@ struct sbp2_target {
  	struct list_head lu_list;
  };
  
 -#define SBP2_MAX_SG_ELEMENT_LENGTH	0xf000
 +/*
-+ * Per section 7.4.8 of the SBP-2 spec, an mgt_ORB_timeout value
-+ * can be provided in some config roms, but usually isn't, so we
-+ * just use 20s rather than hassling with it, since we won't buy
-+ * anything except on devices with disgustingly long timeouts.
++ * Per section 7.4.8 of the SBP-2 spec, a mgt_ORB_timeout value
++ * can be provided in a config rom, but usually isn't. A high
++ * timeout value really only matters on initial login, where we'll
++ * just use 20s rather than hassling with reading the config rom,
++ * since it really wouldn't buy us much.
 + */
-+#define SBP2_MGT_ORB_TIMEOUT		20000	/* Timeout in ms */
++#define SBP2_LOGIN_ORB_TIMEOUT		20000	/* Timeout in ms */
  #define SBP2_ORB_TIMEOUT		2000	/* Timeout in ms */
  #define SBP2_ORB_NULL			0x80000000
 +#define SBP2_MAX_SG_ELEMENT_LENGTH	0xf000
  
  #define SBP2_DIRECTION_TO_MEDIA		0x0
  #define SBP2_DIRECTION_FROM_MEDIA	0x1
-@@ -487,6 +494,7 @@ sbp2_send_management_orb(struct sbp2_logical_unit *lu, int node_id,
+@@ -487,6 +495,7 @@ sbp2_send_management_orb(struct sbp2_logical_unit *lu, int node_id,
  {
  	struct fw_device *device = fw_device(lu->tgt->unit->device.parent);
  	struct sbp2_management_orb *orb;
@@ -41,18 +42,18 @@
  	int retval = -ENOMEM;
  
  	orb = kzalloc(sizeof(*orb), GFP_ATOMIC);
-@@ -517,7 +525,9 @@ sbp2_send_management_orb(struct sbp2_logical_unit *lu, int node_id,
+@@ -517,7 +526,9 @@ sbp2_send_management_orb(struct sbp2_logical_unit *lu, int node_id,
  		orb->request.misc |=
  			MANAGEMENT_ORB_EXCLUSIVE(sbp2_param_exclusive_login) |
  			MANAGEMENT_ORB_RECONNECT(0);
 -	}
-+		timeout = SBP2_MGT_ORB_TIMEOUT;
++		timeout = SBP2_LOGIN_ORB_TIMEOUT;
 +	} else
 +		timeout = SBP2_ORB_TIMEOUT;
  
  	fw_memcpy_to_be32(&orb->request, &orb->request, sizeof(orb->request));
  
-@@ -534,7 +544,7 @@ sbp2_send_management_orb(struct sbp2_logical_unit *lu, int node_id,
+@@ -534,7 +545,7 @@ sbp2_send_management_orb(struct sbp2_logical_unit *lu, int node_id,
  		      lu->tgt->management_agent_address);
  
  	wait_for_completion_timeout(&orb->done,