Merge branch 'master' into csb1725

[mv-sheeva.git] / drivers / net / tulip / de2104x.c

diff --git a/drivers/net/tulip/de2104x.c b/drivers/net/tulip/de2104x.c
index 6888e3d41462081952c7320b501736f03230ba78..c78a50586c1d86a0fffa9a59ab461a1996da8122 100644 (file)
--- a/drivers/net/tulip/de2104x.c
+++ b/drivers/net/tulip/de2104x.c
@@ -948,8 +948,9 @@ static void de_set_media (struct de_private *de)
        else
                macmode &= ~FullDuplex;
 
-       if (netif_msg_link(de)) {
+       if (netif_msg_link(de))
                dev_info(&de->dev->dev, "set link %s\n", media_name[media]);
+       if (netif_msg_hw(de)) {
                dev_info(&de->dev->dev, "mode 0x%x, sia 0x%x,0x%x,0x%x,0x%x\n",
                         dr32(MacMode), dr32(SIAStatus),
                         dr32(CSR13), dr32(CSR14), dr32(CSR15));
@@ -2020,7 +2021,6 @@ static int __devinit de_init_one (struct pci_dev *pdev,
        de->media_timer.data = (unsigned long) de;
 
        netif_carrier_off(dev);
-       netif_stop_queue(dev);
 
        /* wake up device, assign resources */
        rc = pci_enable_device(pdev);