Gentoo Archives: gentoo-commits

From: "Daniel Drake (dsd)" <dsd@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] linux-patches r1305 - genpatches-2.6/trunk/2.6.24
Date: Fri, 02 May 2008 17:31:00
Message-Id: E1Jrz62-00064c-3j@stork.gentoo.org
1 Author: dsd
2 Date: 2008-05-02 17:30:57 +0000 (Fri, 02 May 2008)
3 New Revision: 1305
4
5 Added:
6 genpatches-2.6/trunk/2.6.24/2500_qla2xxx-relogin-loop-id.patch
7 Modified:
8 genpatches-2.6/trunk/2.6.24/0000_README
9 Log:
10 Fix regression in QLA2xxx relogin handling
11
12 Modified: genpatches-2.6/trunk/2.6.24/0000_README
13 ===================================================================
14 --- genpatches-2.6/trunk/2.6.24/0000_README 2008-05-02 17:26:00 UTC (rev 1304)
15 +++ genpatches-2.6/trunk/2.6.24/0000_README 2008-05-02 17:30:57 UTC (rev 1305)
16 @@ -83,6 +83,10 @@
17 From: http://bugs.gentoo.org/215714
18 Desc: Fix IPW2200 radiotap interface
19
20 +Patch: 2500_qla2xxx-relogin-loop-id.patch
21 +From: http://bugs.gentoo.org/214883
22 +Desc: Fix regression in QLA2xxx relogin handling
23 +
24 Patch: 2510_ricoh-handle-susp-resum-disab.patch
25 From: http://bugs.gentoo.org/185581
26 Desc: Handle suspend/resume in Ricoh MMC disabler
27
28 Added: genpatches-2.6/trunk/2.6.24/2500_qla2xxx-relogin-loop-id.patch
29 ===================================================================
30 --- genpatches-2.6/trunk/2.6.24/2500_qla2xxx-relogin-loop-id.patch (rev 0)
31 +++ genpatches-2.6/trunk/2.6.24/2500_qla2xxx-relogin-loop-id.patch 2008-05-02 17:30:57 UTC (rev 1305)
32 @@ -0,0 +1,31 @@
33 +From: Andrew Vasquez <andrew.vasquez@××××××.com>
34 +Date: Thu, 24 Apr 2008 22:21:30 +0000 (-0700)
35 +Subject: [SCSI] qla2xxx: Correct regression in relogin code.
36 +X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Ftorvalds%2Flinux-2.6.git;a=commitdiff_plain;h=666301e673e192c87a40e07a8357d6996b57b70f
37 +
38 +[SCSI] qla2xxx: Correct regression in relogin code.
39 +
40 +Commit 63a8651f2548c6bb5132c0b4e7dad4f57a9274db ([SCSI] qla2xxx:
41 +Correct infinite-login-retry issue.) introduced a small
42 +regression where a successful relogin would result in an fcport's
43 +loop_id to be incorrectly reset to FC_NO_LOOP_ID. Only clear-out
44 +loopid, if retries have been 'truly' exhausted.
45 +
46 +Signed-off-by: Andrew Vasquez <andrew.vasquez@××××××.com>
47 +Cc: Stable Tree <stable@××××××.org>
48 +Signed-off-by: James Bottomley <James.Bottomley@×××××××××××××××××.com>
49 +---
50 +
51 +diff --git a/drivers/scsi/qla2xxx/qla_os.c b/drivers/scsi/qla2xxx/qla_os.c
52 +index 878a37a..3223fd1 100644
53 +--- a/drivers/scsi/qla2xxx/qla_os.c
54 ++++ b/drivers/scsi/qla2xxx/qla_os.c
55 +@@ -2373,7 +2373,7 @@ qla2x00_do_dpc(void *data)
56 + } else {
57 + fcport->login_retry = 0;
58 + }
59 +- if (fcport->login_retry == 0)
60 ++ if (fcport->login_retry == 0 && status != QLA_SUCCESS)
61 + fcport->loop_id = FC_NO_LOOP_ID;
62 + }
63 + if (test_bit(LOOP_RESYNC_NEEDED, &ha->dpc_flags))
64
65 --
66 gentoo-commits@l.g.o mailing list