Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6

* 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6: (118 commits)
  [netdrvr] skge: build fix
  [PATCH] NetXen: driver cleanup, removed unnecessary __iomem type casts
  [PATCH] PHY: Add support for configuring the PHY connection interface
  [PATCH] chelesio: transmit locking (plus bug fix).
  [PATCH] chelsio: statistics improvement
  [PATCH] chelsio: add MSI support
  [PATCH] chelsio: use standard CRC routines
  [PATCH] chelsio: cleanup pm3393 code
  [PATCH] chelsio: add 1G swcixw aupport
  [PATCH] chelsio: add support for other 10G boards
  [PATCH] chelsio: remove unused mutex
  [PATCH] chelsio: use kzalloc
  [PATCH] chelsio: whitespace fixes
  [PATCH] amd8111e use standard CRC lib
  [PATCH] sky2: msi enhancements.
  [PATCH] sky2: kfree_skb_any needed
  [PATCH] sky2: fixes for Yukon EC_U chip revisions
  [PATCH] sky2: add Dlink 560SX id
  [PATCH] sky2: receive error handling fix
  [PATCH] skge: don't clear MC state on link down
  ...

1 files changed, 13 insertions, 15 deletions

diff --git a/drivers/net/depca.c b/drivers/net/depca.c
index f87f6e3dc721..5113eef755b9 100644
--- 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 */
 }
 
 /*