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>

diff --git a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_ethtool.c b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_ethtool.c
index 59d73f23de678b21692055b42adfd6edced84283..720b3330aafad2fd0311b5ba8e35b95e6e3dd1b0 100644 (file)
--- 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[])
        return memcmp(data, buff, QLCNIC_ILB_PKT_SIZE);
 }
 
-static int qlcnic_do_lb_test(struct qlcnic_adapter *adapter)
+static int qlcnic_do_lb_test(struct qlcnic_adapter *adapter, u8 mode)
 {
        struct qlcnic_recv_context *recv_ctx = adapter->recv_ctx;
        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)
                dev_kfree_skb_any(skb);
 
                if (!adapter->diag_cnt)
-                       dev_warn(&adapter->pdev->dev, "LB Test: %dth packet"
-                               " not recevied\n", i + 1);
+                       QLCDB(adapter, DRV,
+                       "LB Test: packet #%d was not received\n", i + 1);
                else
                        cnt++;
        }
        if (cnt != i) {
                dev_warn(&adapter->pdev->dev, "LB Test failed\n");
+               if (mode != QLCNIC_ILB_MODE) {
+                       dev_warn(&adapter->pdev->dev,
+                               "WARNING: Please make sure external"
+                               "loopback connector is plugged in\n");
+               }
                return -1;
        }
        return 0;
@@ -761,7 +766,7 @@ static int qlcnic_loopback_test(struct net_device *netdev, u8 mode)
                return -EOPNOTSUPP;
        }
 
-       netdev_info(netdev, "%s loopback test in progress\n",
+       QLCDB(adapter, DRV, "%s loopback test in progress\n",
                   mode == QLCNIC_ILB_MODE ? "internal" : "external");
        if (adapter->op_mode == QLCNIC_NON_PRIV_FUNC) {
                netdev_warn(netdev, "Loopback test not supported for non "
@@ -797,7 +802,7 @@ static int qlcnic_loopback_test(struct net_device *netdev, u8 mode)
                }
        } while (!QLCNIC_IS_LB_CONFIGURED(adapter->ahw->loopback_state));
 
-       ret = qlcnic_do_lb_test(adapter);
+       ret = qlcnic_do_lb_test(adapter, mode);
 
        qlcnic_clear_lb_mode(adapter);
 

diff --git a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_init.c b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_init.c
index 3b6741e4754dea9b239942f227f16d152c28ba56..b02859c7a23d70d91613050517c578014c9b6304 100644 (file)
--- 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,
        spin_unlock(&rds_ring->lock);
 }
 
-static void dump_skb(struct sk_buff *skb)
+static void dump_skb(struct sk_buff *skb, struct qlcnic_adapter *adapter)
 {
        int i;
        unsigned char *data = skb->data;
 
        printk(KERN_INFO "\n");
        for (i = 0; i < skb->len; i++) {
-               printk(KERN_INFO "%02x ", data[i]);
+               QLCDB(adapter, DRV, "%02x ", data[i]);
                if ((i & 0x0f) == 8)
                        printk(KERN_INFO "\n");
        }
@@ -1829,7 +1829,7 @@ void qlcnic_process_rcv_diag(struct qlcnic_adapter *adapter,
        if (!qlcnic_check_loopback_buff(skb->data, adapter->mac_addr))
                adapter->diag_cnt++;
        else
-               dump_skb(skb);
+               dump_skb(skb, adapter);
 
        dev_kfree_skb_any(skb);
        adapter->stats.rx_pkts++;