diff options
author | Manish chopra <Manish.Chopra@qlogic.com> | 2011-08-29 08:50:27 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2011-08-29 22:52:50 -0400 |
commit | df3cfbe30bcd8ddfbbac2d0893c53b6d048dd1f8 (patch) | |
tree | ebb5768b3f9dec42e5443337b7f08ffbd0d0b666 | |
parent | 44f65b290235a1b259eea1aa055b5b1be36d3c86 (diff) |
qlcnic: Change debug messages in loopback path
Added more debug messages while loopback test in progress
Signed-off-by: Manish chopra <Manish.Chopra@qlogic.com>
Signed-off-by: Sony Chacko <sony.chacko@qlogic.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r-- | drivers/net/ethernet/qlogic/qlcnic/qlcnic_ethtool.c | 15 | ||||
-rw-r--r-- | drivers/net/ethernet/qlogic/qlcnic/qlcnic_init.c | 6 |
2 files changed, 13 insertions, 8 deletions
diff --git a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_ethtool.c b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_ethtool.c index 59d73f23de67..720b3330aafa 100644 --- a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_ethtool.c +++ b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_ethtool.c | |||
@@ -710,7 +710,7 @@ int qlcnic_check_loopback_buff(unsigned char *data, u8 mac[]) | |||
710 | return memcmp(data, buff, QLCNIC_ILB_PKT_SIZE); | 710 | return memcmp(data, buff, QLCNIC_ILB_PKT_SIZE); |
711 | } | 711 | } |
712 | 712 | ||
713 | static int qlcnic_do_lb_test(struct qlcnic_adapter *adapter) | 713 | static int qlcnic_do_lb_test(struct qlcnic_adapter *adapter, u8 mode) |
714 | { | 714 | { |
715 | struct qlcnic_recv_context *recv_ctx = adapter->recv_ctx; | 715 | struct qlcnic_recv_context *recv_ctx = adapter->recv_ctx; |
716 | struct qlcnic_host_sds_ring *sds_ring = &recv_ctx->sds_rings[0]; | 716 | struct qlcnic_host_sds_ring *sds_ring = &recv_ctx->sds_rings[0]; |
@@ -736,13 +736,18 @@ static int qlcnic_do_lb_test(struct qlcnic_adapter *adapter) | |||
736 | dev_kfree_skb_any(skb); | 736 | dev_kfree_skb_any(skb); |
737 | 737 | ||
738 | if (!adapter->diag_cnt) | 738 | if (!adapter->diag_cnt) |
739 | dev_warn(&adapter->pdev->dev, "LB Test: %dth packet" | 739 | QLCDB(adapter, DRV, |
740 | " not recevied\n", i + 1); | 740 | "LB Test: packet #%d was not received\n", i + 1); |
741 | else | 741 | else |
742 | cnt++; | 742 | cnt++; |
743 | } | 743 | } |
744 | if (cnt != i) { | 744 | if (cnt != i) { |
745 | dev_warn(&adapter->pdev->dev, "LB Test failed\n"); | 745 | dev_warn(&adapter->pdev->dev, "LB Test failed\n"); |
746 | if (mode != QLCNIC_ILB_MODE) { | ||
747 | dev_warn(&adapter->pdev->dev, | ||
748 | "WARNING: Please make sure external" | ||
749 | "loopback connector is plugged in\n"); | ||
750 | } | ||
746 | return -1; | 751 | return -1; |
747 | } | 752 | } |
748 | return 0; | 753 | return 0; |
@@ -761,7 +766,7 @@ static int qlcnic_loopback_test(struct net_device *netdev, u8 mode) | |||
761 | return -EOPNOTSUPP; | 766 | return -EOPNOTSUPP; |
762 | } | 767 | } |
763 | 768 | ||
764 | netdev_info(netdev, "%s loopback test in progress\n", | 769 | QLCDB(adapter, DRV, "%s loopback test in progress\n", |
765 | mode == QLCNIC_ILB_MODE ? "internal" : "external"); | 770 | mode == QLCNIC_ILB_MODE ? "internal" : "external"); |
766 | if (adapter->op_mode == QLCNIC_NON_PRIV_FUNC) { | 771 | if (adapter->op_mode == QLCNIC_NON_PRIV_FUNC) { |
767 | netdev_warn(netdev, "Loopback test not supported for non " | 772 | netdev_warn(netdev, "Loopback test not supported for non " |
@@ -797,7 +802,7 @@ static int qlcnic_loopback_test(struct net_device *netdev, u8 mode) | |||
797 | } | 802 | } |
798 | } while (!QLCNIC_IS_LB_CONFIGURED(adapter->ahw->loopback_state)); | 803 | } while (!QLCNIC_IS_LB_CONFIGURED(adapter->ahw->loopback_state)); |
799 | 804 | ||
800 | ret = qlcnic_do_lb_test(adapter); | 805 | ret = qlcnic_do_lb_test(adapter, mode); |
801 | 806 | ||
802 | qlcnic_clear_lb_mode(adapter); | 807 | qlcnic_clear_lb_mode(adapter); |
803 | 808 | ||
diff --git a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_init.c b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_init.c index 3b6741e4754d..b02859c7a23d 100644 --- a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_init.c +++ b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_init.c | |||
@@ -1779,14 +1779,14 @@ qlcnic_post_rx_buffers_nodb(struct qlcnic_adapter *adapter, | |||
1779 | spin_unlock(&rds_ring->lock); | 1779 | spin_unlock(&rds_ring->lock); |
1780 | } | 1780 | } |
1781 | 1781 | ||
1782 | static void dump_skb(struct sk_buff *skb) | 1782 | static void dump_skb(struct sk_buff *skb, struct qlcnic_adapter *adapter) |
1783 | { | 1783 | { |
1784 | int i; | 1784 | int i; |
1785 | unsigned char *data = skb->data; | 1785 | unsigned char *data = skb->data; |
1786 | 1786 | ||
1787 | printk(KERN_INFO "\n"); | 1787 | printk(KERN_INFO "\n"); |
1788 | for (i = 0; i < skb->len; i++) { | 1788 | for (i = 0; i < skb->len; i++) { |
1789 | printk(KERN_INFO "%02x ", data[i]); | 1789 | QLCDB(adapter, DRV, "%02x ", data[i]); |
1790 | if ((i & 0x0f) == 8) | 1790 | if ((i & 0x0f) == 8) |
1791 | printk(KERN_INFO "\n"); | 1791 | printk(KERN_INFO "\n"); |
1792 | } | 1792 | } |
@@ -1829,7 +1829,7 @@ void qlcnic_process_rcv_diag(struct qlcnic_adapter *adapter, | |||
1829 | if (!qlcnic_check_loopback_buff(skb->data, adapter->mac_addr)) | 1829 | if (!qlcnic_check_loopback_buff(skb->data, adapter->mac_addr)) |
1830 | adapter->diag_cnt++; | 1830 | adapter->diag_cnt++; |
1831 | else | 1831 | else |
1832 | dump_skb(skb); | 1832 | dump_skb(skb, adapter); |
1833 | 1833 | ||
1834 | dev_kfree_skb_any(skb); | 1834 | dev_kfree_skb_any(skb); |
1835 | adapter->stats.rx_pkts++; | 1835 | adapter->stats.rx_pkts++; |