[kernel] r10168 - dists/trunk/linux-2.6/debian/patches/bugfix/all

[Maximilian Attems]

Author: maks
Date: Wed Jan 23 10:38:39 2008
New Revision: 10168

Log:
fw: sync with latest git, step one

Revert "firewire: fw-sbp2: quiet logout errors on device removal",
obsoleted by "firewire: fw-sbp2: skip unnecessary logout".


Modified:
   dists/trunk/linux-2.6/debian/patches/bugfix/all/git-ieee1394.patch

Modified: dists/trunk/linux-2.6/debian/patches/bugfix/all/git-ieee1394.patch
==============================================================================
--- dists/trunk/linux-2.6/debian/patches/bugfix/all/git-ieee1394.patch	(original)
+++ dists/trunk/linux-2.6/debian/patches/bugfix/all/git-ieee1394.patch	Wed Jan 23 10:38:39 2008
@@ -232,18 +232,6 @@
     Signed-off-by: Joe Perches <joe at perches.com>
     Signed-off-by: Stefan Richter <stefanr at s5r6.in-berlin.de>
 
-commit b4be6170ef896e3a98a71e03f3514ccff264ffde
-Author: Jay Fenlason <fenlason at redhat.com>
-Date:   Wed Nov 7 17:39:00 2007 -0500
-
-    firewire: fw-sbp2: quiet logout errors on device removal
-    
-    This suppresses both reply timed out and management write failed
-    errors on LOGOUT requests.
-    
-    Signed-off-by: Jay Fenlason <fenlason at redhat.com>
-    Signed-off-by: Stefan Richter <stefanr at s5r6.in-berlin.de>
-
 commit 8f50ff61ed0282179371cbef173b8b0aad0d1313
 Author: Stefan Richter <stefanr at s5r6.in-berlin.de>
 Date:   Sun Nov 4 14:59:24 2007 +0100
@@ -592,37 +580,6 @@
  #define SBP2_ORB_NULL			0x80000000
  
  #define SBP2_DIRECTION_TO_MEDIA		0x0
-@@ -540,14 +538,26 @@ sbp2_send_management_orb(struct sbp2_logical_unit *lu, int node_id,
- 
- 	retval = -EIO;
- 	if (sbp2_cancel_orbs(lu) == 0) {
--		fw_error("orb reply timed out, rcode=0x%02x\n",
--			 orb->base.rcode);
-+		/*
-+		 * Logout requests frequently get sent to devices that aren't
-+		 * there any more, resulting in extraneous error messages in
-+		 * the logs.  Unfortunately, this means logout requests that
-+		 * actually fail don't get logged.
-+		 */
-+		if (function != SBP2_LOGOUT_REQUEST)
-+			fw_error("orb reply timed out, rcode=0x%02x\n",
-+				 orb->base.rcode);
- 		goto out;
- 	}
- 
- 	if (orb->base.rcode != RCODE_COMPLETE) {
--		fw_error("management write failed, rcode 0x%02x\n",
--			 orb->base.rcode);
-+		/*
-+		 * On device removal from the bus, sometimes the logout
-+		 * request times out, sometimes it just fails.
-+		 */
-+		if (function != SBP2_LOGOUT_REQUEST)
-+			fw_error("management write failed, rcode 0x%02x\n",
-+				 orb->base.rcode);
- 		goto out;
- 	}
- 
 @@ -628,6 +638,21 @@ static void sbp2_release_target(struct kref *kref)
  
  static struct workqueue_struct *sbp2_wq;