ixgb: Fix early TSO completion

[pandora-kernel.git] / drivers / net / depca.c

diff --git a/drivers/net/depca.c b/drivers/net/depca.c
index f87f6e3..5113eef 100644 (file)
--- a/drivers/net/depca.c
+++ b/drivers/net/depca.c
@@ -1252,24 +1252,22 @@ static void set_multicast_list(struct net_device *dev)
        struct depca_private *lp = (struct depca_private *) dev->priv;
        u_long ioaddr = dev->base_addr;
 
-       if (dev) {
-               netif_stop_queue(dev);
-               while (lp->tx_old != lp->tx_new);       /* Wait for the ring to empty */
-
-               STOP_DEPCA;     /* Temporarily stop the depca.  */
-               depca_init_ring(dev);   /* Initialize the descriptor rings */
+       netif_stop_queue(dev);
+       while (lp->tx_old != lp->tx_new);       /* Wait for the ring to empty */
 
-               if (dev->flags & IFF_PROMISC) { /* Set promiscuous mode */
-                       lp->init_block.mode |= PROM;
-               } else {
-                       SetMulticastFilter(dev);
-                       lp->init_block.mode &= ~PROM;   /* Unset promiscuous mode */
-               }
+       STOP_DEPCA;     /* Temporarily stop the depca.  */
+       depca_init_ring(dev);   /* Initialize the descriptor rings */
 
-               LoadCSRs(dev);  /* Reload CSR3 */
-               InitRestartDepca(dev);  /* Resume normal operation. */
-               netif_start_queue(dev); /* Unlock the TX ring */
+       if (dev->flags & IFF_PROMISC) { /* Set promiscuous mode */
+               lp->init_block.mode |= PROM;
+       } else {
+               SetMulticastFilter(dev);
+               lp->init_block.mode &= ~PROM;   /* Unset promiscuous mode */
        }
+
+       LoadCSRs(dev);  /* Reload CSR3 */
+       InitRestartDepca(dev);  /* Resume normal operation. */
+       netif_start_queue(dev); /* Unlock the TX ring */
 }
 
 /*