1 files changed, 9 insertions, 4 deletions

diff --git a/drivers/net/spider_net.c b/drivers/net/spider_net.c
index 9d2ed04f9fd1..0eeff1add882 100644
--- a/drivers/net/spider_net.c
+++ b/drivers/net/spider_net.c
@@ -1245,12 +1245,15 @@ spider_net_handle_error_irq(struct spider_net_card *card, u32 status_reg)
         case SPIDER_NET_PHYINT:
         case SPIDER_NET_GMAC2INT:
         case SPIDER_NET_GMAC1INT:
-        case SPIDER_NET_GIPSINT:
         case SPIDER_NET_GFIFOINT:
         case SPIDER_NET_DMACINT:
         case SPIDER_NET_GSYSINT:
                 break; */
 
+        case SPIDER_NET_GIPSINT:
+                show_error = 0;
+                break;
+
         case SPIDER_NET_GPWOPCMPINT:
                 /* PHY write operation completed */
                 show_error = 0;
@@ -1309,9 +1312,10 @@ spider_net_handle_error_irq(struct spider_net_card *card, u32 status_reg)
         case SPIDER_NET_GDTDCEINT:
                 /* chain end. If a descriptor should be sent, kick off
                  * tx dma
-                if (card->tx_chain.tail == card->tx_chain.head)
+                if (card->tx_chain.tail != card->tx_chain.head)
                         spider_net_kick_tx_dma(card);
-                show_error = 0; */
+                */
+                show_error = 0;
                 break;
 
         /* case SPIDER_NET_G1TMCNTINT: not used. print a message */
@@ -1425,8 +1429,9 @@ spider_net_handle_error_irq(struct spider_net_card *card, u32 status_reg)
         }
 
         if ((show_error) && (netif_msg_intr(card)))
-                pr_err("Got error interrupt, GHIINT0STS = 0x%08x, "
+                pr_err("Got error interrupt on %s, GHIINT0STS = 0x%08x, "
                        "GHIINT1STS = 0x%08x, GHIINT2STS = 0x%08x\n",
+                       card->netdev->name,
                        status_reg, error_reg1, error_reg2);
 
         /* clear interrupt sources */