patch-2.4.19 linux-2.4.19/drivers/net/fc/iph5526.c

• Lines: 23
• Date: Fri Aug 2 17:39:44 2002
• Orig file: linux-2.4.18/drivers/net/fc/iph5526.c
• Orig date: Sun Sep 30 12:26:08 2001

diff -urN linux-2.4.18/drivers/net/fc/iph5526.c linux-2.4.19/drivers/net/fc/iph5526.c
@@ -2984,8 +2984,7 @@
 	 */
 	if ((type == ETH_P_ARP) || (status == 0))
 		dev_kfree_skb(skb);
-	else
-		netif_wake_queue(dev);
+	netif_wake_queue(dev);
 	LEAVE("iph5526_send_packet");
 	return 0;
 }
@@ -3871,8 +3870,11 @@
 		/* Wait for the Link to come up and the login process 
 		 * to complete. 
 		 */
-		for(timeout = jiffies + 10*HZ; (timeout > jiffies) && ((fi->g.link_up == FALSE) || (fi->g.port_discovery == TRUE) || (fi->g.explore_fabric == TRUE) || (fi->g.perform_adisc == TRUE));)
+		for(timeout = jiffies + 10*HZ; time_before(jiffies, timeout) && ((fi->g.link_up == FALSE) || (fi->g.port_discovery == TRUE) || (fi->g.explore_fabric == TRUE) || (fi->g.perform_adisc == TRUE));)
+		{
+			cpu_relax();
 			barrier();
+		}
 		
 		count++;
 		no_of_hosts++;