diff options
Diffstat (limited to 'drivers/net')
-rw-r--r-- | drivers/net/qlge/qlge_main.c | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/drivers/net/qlge/qlge_main.c b/drivers/net/qlge/qlge_main.c index d1d8f05d5a11..b4c6fd7a7616 100644 --- a/drivers/net/qlge/qlge_main.c +++ b/drivers/net/qlge/qlge_main.c | |||
@@ -58,8 +58,8 @@ static const u32 default_msg = | |||
58 | NETIF_MSG_IFUP | | 58 | NETIF_MSG_IFUP | |
59 | NETIF_MSG_RX_ERR | | 59 | NETIF_MSG_RX_ERR | |
60 | NETIF_MSG_TX_ERR | | 60 | NETIF_MSG_TX_ERR | |
61 | NETIF_MSG_TX_QUEUED | | 61 | /* NETIF_MSG_TX_QUEUED | */ |
62 | NETIF_MSG_INTR | NETIF_MSG_TX_DONE | NETIF_MSG_RX_STATUS | | 62 | /* NETIF_MSG_INTR | NETIF_MSG_TX_DONE | NETIF_MSG_RX_STATUS | */ |
63 | /* NETIF_MSG_PKTDATA | */ | 63 | /* NETIF_MSG_PKTDATA | */ |
64 | NETIF_MSG_HW | NETIF_MSG_WOL | 0; | 64 | NETIF_MSG_HW | NETIF_MSG_WOL | 0; |
65 | 65 | ||
@@ -327,7 +327,7 @@ static int ql_set_mac_addr_reg(struct ql_adapter *qdev, u8 *addr, u32 type, | |||
327 | (addr[2] << 24) | (addr[3] << 16) | (addr[4] << 8) | | 327 | (addr[2] << 24) | (addr[3] << 16) | (addr[4] << 8) | |
328 | (addr[5]); | 328 | (addr[5]); |
329 | 329 | ||
330 | QPRINTK(qdev, IFUP, INFO, | 330 | QPRINTK(qdev, IFUP, DEBUG, |
331 | "Adding %s address %pM" | 331 | "Adding %s address %pM" |
332 | " at index %d in the CAM.\n", | 332 | " at index %d in the CAM.\n", |
333 | ((type == | 333 | ((type == |
@@ -2552,7 +2552,7 @@ static int ql_start_rx_ring(struct ql_adapter *qdev, struct rx_ring *rx_ring) | |||
2552 | QPRINTK(qdev, IFUP, DEBUG, "Invalid rx_ring->type = %d.\n", | 2552 | QPRINTK(qdev, IFUP, DEBUG, "Invalid rx_ring->type = %d.\n", |
2553 | rx_ring->type); | 2553 | rx_ring->type); |
2554 | } | 2554 | } |
2555 | QPRINTK(qdev, IFUP, INFO, "Initializing rx work queue.\n"); | 2555 | QPRINTK(qdev, IFUP, DEBUG, "Initializing rx work queue.\n"); |
2556 | err = ql_write_cfg(qdev, cqicb, sizeof(struct cqicb), | 2556 | err = ql_write_cfg(qdev, cqicb, sizeof(struct cqicb), |
2557 | CFG_LCQ, rx_ring->cq_id); | 2557 | CFG_LCQ, rx_ring->cq_id); |
2558 | if (err) { | 2558 | if (err) { |
@@ -2605,7 +2605,7 @@ static int ql_start_tx_ring(struct ql_adapter *qdev, struct tx_ring *tx_ring) | |||
2605 | QPRINTK(qdev, IFUP, ERR, "Failed to load tx_ring.\n"); | 2605 | QPRINTK(qdev, IFUP, ERR, "Failed to load tx_ring.\n"); |
2606 | return err; | 2606 | return err; |
2607 | } | 2607 | } |
2608 | QPRINTK(qdev, IFUP, INFO, "Successfully loaded WQICB.\n"); | 2608 | QPRINTK(qdev, IFUP, DEBUG, "Successfully loaded WQICB.\n"); |
2609 | return err; | 2609 | return err; |
2610 | } | 2610 | } |
2611 | 2611 | ||
@@ -2647,7 +2647,7 @@ static void ql_enable_msix(struct ql_adapter *qdev) | |||
2647 | (qdev->pdev, qdev->msi_x_entry, qdev->rx_ring_count)) { | 2647 | (qdev->pdev, qdev->msi_x_entry, qdev->rx_ring_count)) { |
2648 | set_bit(QL_MSIX_ENABLED, &qdev->flags); | 2648 | set_bit(QL_MSIX_ENABLED, &qdev->flags); |
2649 | qdev->intr_count = qdev->rx_ring_count; | 2649 | qdev->intr_count = qdev->rx_ring_count; |
2650 | QPRINTK(qdev, IFUP, INFO, | 2650 | QPRINTK(qdev, IFUP, DEBUG, |
2651 | "MSI-X Enabled, got %d vectors.\n", | 2651 | "MSI-X Enabled, got %d vectors.\n", |
2652 | qdev->intr_count); | 2652 | qdev->intr_count); |
2653 | return; | 2653 | return; |
@@ -2774,11 +2774,11 @@ static void ql_free_irq(struct ql_adapter *qdev) | |||
2774 | if (test_bit(QL_MSIX_ENABLED, &qdev->flags)) { | 2774 | if (test_bit(QL_MSIX_ENABLED, &qdev->flags)) { |
2775 | free_irq(qdev->msi_x_entry[i].vector, | 2775 | free_irq(qdev->msi_x_entry[i].vector, |
2776 | &qdev->rx_ring[i]); | 2776 | &qdev->rx_ring[i]); |
2777 | QPRINTK(qdev, IFDOWN, ERR, | 2777 | QPRINTK(qdev, IFDOWN, DEBUG, |
2778 | "freeing msix interrupt %d.\n", i); | 2778 | "freeing msix interrupt %d.\n", i); |
2779 | } else { | 2779 | } else { |
2780 | free_irq(qdev->pdev->irq, &qdev->rx_ring[0]); | 2780 | free_irq(qdev->pdev->irq, &qdev->rx_ring[0]); |
2781 | QPRINTK(qdev, IFDOWN, ERR, | 2781 | QPRINTK(qdev, IFDOWN, DEBUG, |
2782 | "freeing msi interrupt %d.\n", i); | 2782 | "freeing msi interrupt %d.\n", i); |
2783 | } | 2783 | } |
2784 | } | 2784 | } |
@@ -2809,7 +2809,7 @@ static int ql_request_irq(struct ql_adapter *qdev) | |||
2809 | i); | 2809 | i); |
2810 | goto err_irq; | 2810 | goto err_irq; |
2811 | } else { | 2811 | } else { |
2812 | QPRINTK(qdev, IFUP, INFO, | 2812 | QPRINTK(qdev, IFUP, DEBUG, |
2813 | "Hooked intr %d, queue type %s%s%s, with name %s.\n", | 2813 | "Hooked intr %d, queue type %s%s%s, with name %s.\n", |
2814 | i, | 2814 | i, |
2815 | qdev->rx_ring[i].type == | 2815 | qdev->rx_ring[i].type == |
@@ -2884,14 +2884,14 @@ static int ql_start_rss(struct ql_adapter *qdev) | |||
2884 | get_random_bytes((void *)&ricb->ipv6_hash_key[0], 40); | 2884 | get_random_bytes((void *)&ricb->ipv6_hash_key[0], 40); |
2885 | get_random_bytes((void *)&ricb->ipv4_hash_key[0], 16); | 2885 | get_random_bytes((void *)&ricb->ipv4_hash_key[0], 16); |
2886 | 2886 | ||
2887 | QPRINTK(qdev, IFUP, INFO, "Initializing RSS.\n"); | 2887 | QPRINTK(qdev, IFUP, DEBUG, "Initializing RSS.\n"); |
2888 | 2888 | ||
2889 | status = ql_write_cfg(qdev, ricb, sizeof(ricb), CFG_LR, 0); | 2889 | status = ql_write_cfg(qdev, ricb, sizeof(ricb), CFG_LR, 0); |
2890 | if (status) { | 2890 | if (status) { |
2891 | QPRINTK(qdev, IFUP, ERR, "Failed to load RICB.\n"); | 2891 | QPRINTK(qdev, IFUP, ERR, "Failed to load RICB.\n"); |
2892 | return status; | 2892 | return status; |
2893 | } | 2893 | } |
2894 | QPRINTK(qdev, IFUP, INFO, "Successfully loaded RICB.\n"); | 2894 | QPRINTK(qdev, IFUP, DEBUG, "Successfully loaded RICB.\n"); |
2895 | return status; | 2895 | return status; |
2896 | } | 2896 | } |
2897 | 2897 | ||
@@ -3053,7 +3053,7 @@ static int ql_adapter_initialize(struct ql_adapter *qdev) | |||
3053 | 3053 | ||
3054 | /* Start NAPI for the RSS queues. */ | 3054 | /* Start NAPI for the RSS queues. */ |
3055 | for (i = qdev->rss_ring_first_cq_id; i < qdev->rx_ring_count; i++) { | 3055 | for (i = qdev->rss_ring_first_cq_id; i < qdev->rx_ring_count; i++) { |
3056 | QPRINTK(qdev, IFUP, INFO, "Enabling NAPI for rx_ring[%d].\n", | 3056 | QPRINTK(qdev, IFUP, DEBUG, "Enabling NAPI for rx_ring[%d].\n", |
3057 | i); | 3057 | i); |
3058 | napi_enable(&qdev->rx_ring[i].napi); | 3058 | napi_enable(&qdev->rx_ring[i].napi); |
3059 | } | 3059 | } |