[PATCH net-drivers-2.6 3/5] ixgb: Robert Olsson's fix and refinement to the poll routine

[Malli Chilakala <mallikarjuna.chilakala@xxxxxxxxx>]

3 Robert Olsson's fix and refinement to the poll routine
Signed-off-by: Mallikarjuna R Chilakala <mallikarjuna.chilakala@xxxxxxxxx>
Signed-off-by: Ganesh Venkatesan <ganesh.venkatesan@xxxxxxxxx>
Signed-off-by: John Ronciak <john.ronciak@xxxxxxxxx>
diff -up net-drivers-2.6/drivers/net/ixgb/ixgb_main.c 
net-drivers-2.6/drivers/net/ixgb.new/ixgb_main.c
--- net-drivers-2.6/drivers/net/ixgb/ixgb_main.c        2005-02-06 
23:33:00.652031344 -0800
+++ net-drivers-2.6/drivers/net/ixgb.new/ixgb_main.c    2005-02-06 
23:33:01.617884512 -0800
@@ -1669,20 +1669,16 @@ ixgb_clean(struct net_device *netdev, in
        int work_to_do = min(*budget, netdev->quota);
        int tx_cleaned;
        int work_done = 0;
-       
-       if (!netif_carrier_ok(netdev))
-               goto quit_polling;
 
        tx_cleaned = ixgb_clean_tx_irq(adapter);
        ixgb_clean_rx_irq(adapter, &work_done, work_to_do);
 
        *budget -= work_done;
        netdev->quota -= work_done;
-       
-       /* if no Tx cleanup and not enough Rx work done, exit the polling mode 
*/
-       if((!tx_cleaned && (work_done < work_to_do)) || 
-                               !netif_running(netdev)) {
-quit_polling:  netif_rx_complete(netdev);
+
+       /* if no Tx and not enough Rx work done, exit the polling mode */
+       if((!tx_cleaned && (work_done == 0)) || !netif_running(netdev)) {
+               netif_rx_complete(netdev);
                ixgb_irq_enable(adapter);
                return 0;
        }