lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

qlcnic: Change debug messages in loopback path

Browse Source 
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>
This commit is contained in:
Manish chopra
2011-08-29 12:50:27 +00:00
committed by David S. Miller
parent 44f65b2902
commit df3cfbe30b
2 changed files with 13 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
drivers/net/ethernet/qlogic/qlcnic/qlcnic_ethtool.c
View File

@@ -710,7 +710,7 @@ int qlcnic_check_loopback_buff(unsigned char *data, u8 mac[])
return memcmp(data, buff, QLCNIC_ILB_PKT_SIZE); 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_recv_context *recv_ctx = adapter->recv_ctx;
struct qlcnic_host_sds_ring *sds_ring = &recv_ctx->sds_rings[0]; 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); dev_kfree_skb_any(skb);
if (!adapter->diag_cnt) if (!adapter->diag_cnt)
dev_warn(&adapter->pdev->dev, "LB Test: %dth packet" QLCDB(adapter, DRV,
" not recevied\n", i + 1); "LB Test: packet #%d was not received\n", i + 1);
else else
cnt++; cnt++;
} }
if (cnt != i) { if (cnt != i) {
dev_warn(&adapter->pdev->dev, "LB Test failed\n"); 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 -1;
} }
return 0; return 0;
@@ -761,7 +766,7 @@ static int qlcnic_loopback_test(struct net_device *netdev, u8 mode)
return -EOPNOTSUPP; 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"); mode == QLCNIC_ILB_MODE ? "internal" : "external");
if (adapter->op_mode == QLCNIC_NON_PRIV_FUNC) { if (adapter->op_mode == QLCNIC_NON_PRIV_FUNC) {
netdev_warn(netdev, "Loopback test not supported for non " 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)); } 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); qlcnic_clear_lb_mode(adapter);

6
drivers/net/ethernet/qlogic/qlcnic/qlcnic_init.c
View File

@@ -1779,14 +1779,14 @@ qlcnic_post_rx_buffers_nodb(struct qlcnic_adapter *adapter,
spin_unlock(&rds_ring->lock); 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; int i;
unsigned char *data = skb->data; unsigned char *data = skb->data;
printk(KERN_INFO "\n"); printk(KERN_INFO "\n");
for (i = 0; i < skb->len; i++) { for (i = 0; i < skb->len; i++) {
printk(KERN_INFO "%02x ", data[i]); QLCDB(adapter, DRV, "%02x ", data[i]);
if ((i & 0x0f) == 8) if ((i & 0x0f) == 8)
printk(KERN_INFO "\n"); 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)) if (!qlcnic_check_loopback_buff(skb->data, adapter->mac_addr))
adapter->diag_cnt++; adapter->diag_cnt++;
else else
dump_skb(skb); dump_skb(skb, adapter);
dev_kfree_skb_any(skb); dev_kfree_skb_any(skb);
adapter->stats.rx_pkts++; adapter->stats.rx_pkts++;