Merge branch 'for-next' into for-linus

[safe/jmp/linux-2.6] / drivers / net / qlge / qlge_ethtool.c

diff --git a/drivers/net/qlge/qlge_ethtool.c b/drivers/net/qlge/qlge_ethtool.c
index b8d21ab..7dbff87 100644 (file)
--- a/drivers/net/qlge/qlge_ethtool.c
+++ b/drivers/net/qlge/qlge_ethtool.c
@@ -67,8 +67,8 @@ static int ql_update_ring_coalescing(struct ql_adapter *qdev)
                        status = ql_write_cfg(qdev, cqicb, sizeof(*cqicb),
                                                CFG_LCQ, rx_ring->cq_id);
                        if (status) {
-                               QPRINTK(qdev, IFUP, ERR,
-                                       "Failed to load CQICB.\n");
+                               netif_err(qdev, ifup, qdev->ndev,
+                                         "Failed to load CQICB.\n");
                                goto exit;
                        }
                }
@@ -89,8 +89,8 @@ static int ql_update_ring_coalescing(struct ql_adapter *qdev)
                        status = ql_write_cfg(qdev, cqicb, sizeof(*cqicb),
                                                CFG_LCQ, rx_ring->cq_id);
                        if (status) {
-                               QPRINTK(qdev, IFUP, ERR,
-                                       "Failed to load CQICB.\n");
+                               netif_err(qdev, ifup, qdev->ndev,
+                                         "Failed to load CQICB.\n");
                                goto exit;
                        }
                }
@@ -107,8 +107,8 @@ static void ql_update_stats(struct ql_adapter *qdev)
 
        spin_lock(&qdev->stats_lock);
        if (ql_sem_spinlock(qdev, qdev->xg_sem_mask)) {
-                       QPRINTK(qdev, DRV, ERR,
-                               "Couldn't get xgmac sem.\n");
+                       netif_err(qdev, drv, qdev->ndev,
+                                 "Couldn't get xgmac sem.\n");
                goto quit;
        }
        /*
@@ -116,8 +116,9 @@ static void ql_update_stats(struct ql_adapter *qdev)
         */
        for (i = 0x200; i < 0x280; i += 8) {
                if (ql_read_xgmac_reg64(qdev, i, &data)) {
-                       QPRINTK(qdev, DRV, ERR,
-                               "Error reading status register 0x%.04x.\n", i);
+                       netif_err(qdev, drv, qdev->ndev,
+                                 "Error reading status register 0x%.04x.\n",
+                                 i);
                        goto end;
                } else
                        *iter = data;
@@ -129,8 +130,9 @@ static void ql_update_stats(struct ql_adapter *qdev)
         */
        for (i = 0x300; i < 0x3d0; i += 8) {
                if (ql_read_xgmac_reg64(qdev, i, &data)) {
-                       QPRINTK(qdev, DRV, ERR,
-                               "Error reading status register 0x%.04x.\n", i);
+                       netif_err(qdev, drv, qdev->ndev,
+                                 "Error reading status register 0x%.04x.\n",
+                                 i);
                        goto end;
                } else
                        *iter = data;
@@ -142,8 +144,9 @@ static void ql_update_stats(struct ql_adapter *qdev)
         */
        for (i = 0x500; i < 0x540; i += 8) {
                if (ql_read_xgmac_reg64(qdev, i, &data)) {
-                       QPRINTK(qdev, DRV, ERR,
-                               "Error reading status register 0x%.04x.\n", i);
+                       netif_err(qdev, drv, qdev->ndev,
+                                 "Error reading status register 0x%.04x.\n",
+                                 i);
                        goto end;
                } else
                        *iter = data;
@@ -155,8 +158,9 @@ static void ql_update_stats(struct ql_adapter *qdev)
         */
        for (i = 0x568; i < 0x5a8; i += 8) {
                if (ql_read_xgmac_reg64(qdev, i, &data)) {
-                       QPRINTK(qdev, DRV, ERR,
-                               "Error reading status register 0x%.04x.\n", i);
+                       netif_err(qdev, drv, qdev->ndev,
+                                 "Error reading status register 0x%.04x.\n",
+                                 i);
                        goto end;
                } else
                        *iter = data;
@@ -167,8 +171,8 @@ static void ql_update_stats(struct ql_adapter *qdev)
         * Get RX NIC FIFO DROP statistics.
         */
        if (ql_read_xgmac_reg64(qdev, 0x5b8, &data)) {
-               QPRINTK(qdev, DRV, ERR,
-                       "Error reading status register 0x%.04x.\n", i);
+               netif_err(qdev, drv, qdev->ndev,
+                         "Error reading status register 0x%.04x.\n", i);
                goto end;
        } else
                *iter = data;
@@ -396,14 +400,13 @@ static int ql_set_wol(struct net_device *ndev, struct ethtool_wolinfo *wol)
                return -EINVAL;
        qdev->wol = wol->wolopts;
 
-       QPRINTK(qdev, DRV, INFO, "Set wol option 0x%x on %s\n",
-                        qdev->wol, ndev->name);
+       netif_info(qdev, drv, qdev->ndev, "Set wol option 0x%x\n", qdev->wol);
        if (!qdev->wol) {
                u32 wol = 0;
                status = ql_mb_wol_mode(qdev, wol);
-               QPRINTK(qdev, DRV, ERR, "WOL %s (wol code 0x%x) on %s\n",
-                       (status == 0) ? "cleared successfully" : "clear failed",
-                       wol, qdev->ndev->name);
+               netif_err(qdev, drv, qdev->ndev, "WOL %s (wol code 0x%x)\n",
+                         status == 0 ? "cleared successfully" : "clear failed",
+                         wol);
        }
 
        return 0;
@@ -500,7 +503,8 @@ static int ql_run_loopback_test(struct ql_adapter *qdev)
                        return -EPIPE;
                atomic_inc(&qdev->lb_count);
        }
-
+       /* Give queue time to settle before testing results. */
+       msleep(2);
        ql_clean_lb_rx_ring(&qdev->rx_ring[0], 128);
        return atomic_read(&qdev->lb_count) ? -EIO : 0;
 }
@@ -533,9 +537,13 @@ static void ql_self_test(struct net_device *ndev,
                        data[0] = 0;
                }
                clear_bit(QL_SELFTEST, &qdev->flags);
+               /* Give link time to come up after
+                * port configuration changes.
+                */
+               msleep_interruptible(4 * 1000);
        } else {
-               QPRINTK(qdev, DRV, ERR,
-                       "%s: is down, Loopback test will fail.\n", ndev->name);
+               netif_err(qdev, drv, qdev->ndev,
+                         "is down, Loopback test will fail.\n");
                eth_test->flags |= ETH_TEST_FL_FAILED;
        }
 }