rpms/kernel/F-10 linux-2.6-net-qla-silence-debug-printks.patch, NONE, 1.1 kernel.spec, 1.1133, 1.1134

[Dave Jones]

Author: davej

Update of /cvs/pkgs/rpms/kernel/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23049

Modified Files:
	kernel.spec 
Added Files:
	linux-2.6-net-qla-silence-debug-printks.patch 
Log Message:
qla3xxx: Cleanup: Fix link print statements. (#461623)

linux-2.6-net-qla-silence-debug-printks.patch:

--- NEW FILE linux-2.6-net-qla-silence-debug-printks.patch ---
Date: Tue, 11 Nov 2008 09:51:31 -0800
From: Ron Mercer <ron.mercer at qlogic.com>
To: jeff at garzik.org
Cc: davej at redhat.com, cebbert at redhat.com, netdev at vger.linux.org,
        linux-driver at qlogic.com
Subject: [PATCH 1/1] qla3xxx: Cleanup: Fix link print statements.
Message-ID: <20081111175131.GB4328 at susedev.qlogic.org>

Removed debug print statements and improved conditionals around informational statements.

Signed-off-by: Ron Mercer <ron.mercer at qlogic.com>
---
 drivers/net/qla3xxx.c |   19 +++++--------------
 1 files changed, 5 insertions(+), 14 deletions(-)

diff --git a/drivers/net/qla3xxx.c b/drivers/net/qla3xxx.c
index 3cdd07c..508452c 100644
--- a/drivers/net/qla3xxx.c
+++ b/drivers/net/qla3xxx.c
@@ -1515,9 +1515,6 @@ static u32 ql_get_link_state(struct ql3_adapter *qdev)
 		linkState = LS_UP;
 	} else {
 		linkState = LS_DOWN;
-		if (netif_msg_link(qdev))
-			printk(KERN_WARNING PFX
-			       "%s: Link is down.\n", qdev->ndev->name);
 	}
 	return linkState;
 }
@@ -1581,10 +1578,6 @@ static int ql_finish_auto_neg(struct ql3_adapter *qdev)
 			ql_mac_enable(qdev, 1);
 		}
 
-		if (netif_msg_link(qdev))
-			printk(KERN_DEBUG PFX
-			       "%s: Change port_link_state LS_DOWN to LS_UP.\n",
-			       qdev->ndev->name);
 		qdev->port_link_state = LS_UP;
 		netif_start_queue(qdev->ndev);
 		netif_carrier_on(qdev->ndev);
@@ -1655,14 +1648,9 @@ static void ql_link_state_machine_work(struct work_struct *work)
 		/* Fall Through */
 
 	case LS_DOWN:
-		if (netif_msg_link(qdev))
-			printk(KERN_DEBUG PFX
-			       "%s: port_link_state = LS_DOWN.\n",
-			       qdev->ndev->name);
 		if (curr_link_state == LS_UP) {
 			if (netif_msg_link(qdev))
-				printk(KERN_DEBUG PFX
-				       "%s: curr_link_state = LS_UP.\n",
+				printk(KERN_INFO PFX "%s: Link is up.\n",
 				       qdev->ndev->name);
 			if (ql_is_auto_neg_complete(qdev))
 				ql_finish_auto_neg(qdev);
@@ -1670,6 +1658,7 @@ static void ql_link_state_machine_work(struct work_struct *work)
 			if (qdev->port_link_state == LS_UP)
 				ql_link_down_detect_clear(qdev);
 
+			qdev->port_link_state = LS_UP;
 		}
 		break;
 
@@ -1678,12 +1667,14 @@ static void ql_link_state_machine_work(struct work_struct *work)
 		 * See if the link is currently down or went down and came
 		 * back up
 		 */
-		if ((curr_link_state == LS_DOWN) || ql_link_down_detect(qdev)) {
+		if (curr_link_state == LS_DOWN) {
 			if (netif_msg_link(qdev))
 				printk(KERN_INFO PFX "%s: Link is down.\n",
 				       qdev->ndev->name);
 			qdev->port_link_state = LS_DOWN;
 		}
+		if (ql_link_down_detect(qdev))
+			qdev->port_link_state = LS_DOWN;
 		break;
 	}
 	spin_unlock_irqrestore(&qdev->hw_lock, hw_flags);
-- 
1.6.0



Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-10/kernel.spec,v
retrieving revision 1.1133
retrieving revision 1.1134
diff -u -r1.1133 -r1.1134
--- kernel.spec	11 Nov 2008 17:40:29 -0000	1.1133
+++ kernel.spec	11 Nov 2008 18:29:50 -0000	1.1134
@@ -686,6 +686,8 @@
 # Fix DEBUG_SHIRQ problem in tulip driver.  (454575)
 Patch2030: linux-2.6-net-tulip-interrupt.patch
 
+Patch2031: linux-2.6-net-qla-silence-debug-printks.patch
+
 # olpc fixes
 Patch2040: linux-2.6-olpc-speaker-out.patch
 Patch2041: linux-2.6-olpc-touchpad.patch
@@ -1288,6 +1290,8 @@
 
 ApplyPatch linux-2.6-net-tulip-interrupt.patch
 
+ApplyPatch linux-2.6-net-qla-silence-debug-printks.patch
+
 ApplyPatch linux-2.6-olpc-speaker-out.patch
 ApplyPatch linux-2.6-olpc-touchpad.patch
 ApplyPatch linux-2.6-quieter-mmc.patch
@@ -1906,7 +1910,10 @@
 %kernel_variant_files -k vmlinux %{with_kdump} kdump
 
 %changelog
-* Tue Nov 11 2008 Dave Jones <davej at redhat.com>
+* Tue Nov 11 2008 Dave Jones <davej at redhat.com> 2.6.27.5-98
+- qla3xxx: Cleanup: Fix link print statements. (#461623)
+
+* Tue Nov 11 2008 Dave Jones <davej at redhat.com> 2.6.27.5-97
 - ALSA: revo51: add headphone output. (#470813)
 
 * Mon Nov 10 2008 Chuck Ebbert <cebbert at redhat.com> 2.6.27.5-96