Commit fdcd79b9 authored by Stephen Hemminger's avatar Stephen Hemminger Committed by David S. Miller

vmxnet3: use netdev_dbg

Use netdev_dbg() rather than dev_dbg() because the former prints
the device name which is more useful than the pci name.
Signed-off-by: default avatarStephen Hemminger <stephen@networkplumber.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 4bad25fa
...@@ -629,7 +629,7 @@ vmxnet3_rq_alloc_rx_buf(struct vmxnet3_rx_queue *rq, u32 ring_idx, ...@@ -629,7 +629,7 @@ vmxnet3_rq_alloc_rx_buf(struct vmxnet3_rx_queue *rq, u32 ring_idx,
vmxnet3_cmd_ring_adv_next2fill(ring); vmxnet3_cmd_ring_adv_next2fill(ring);
} }
dev_dbg(&adapter->netdev->dev, netdev_dbg(adapter->netdev,
"alloc_rx_buf: %d allocated, next2fill %u, next2comp %u\n", "alloc_rx_buf: %d allocated, next2fill %u, next2comp %u\n",
num_allocated, ring->next2fill, ring->next2comp); num_allocated, ring->next2fill, ring->next2comp);
...@@ -688,7 +688,7 @@ vmxnet3_map_pkt(struct sk_buff *skb, struct vmxnet3_tx_ctx *ctx, ...@@ -688,7 +688,7 @@ vmxnet3_map_pkt(struct sk_buff *skb, struct vmxnet3_tx_ctx *ctx,
tbi = tq->buf_info + tq->tx_ring.next2fill; tbi = tq->buf_info + tq->tx_ring.next2fill;
tbi->map_type = VMXNET3_MAP_NONE; tbi->map_type = VMXNET3_MAP_NONE;
dev_dbg(&adapter->netdev->dev, netdev_dbg(adapter->netdev,
"txd[%u]: 0x%Lx 0x%x 0x%x\n", "txd[%u]: 0x%Lx 0x%x 0x%x\n",
tq->tx_ring.next2fill, tq->tx_ring.next2fill,
le64_to_cpu(ctx->sop_txd->txd.addr), le64_to_cpu(ctx->sop_txd->txd.addr),
...@@ -728,7 +728,7 @@ vmxnet3_map_pkt(struct sk_buff *skb, struct vmxnet3_tx_ctx *ctx, ...@@ -728,7 +728,7 @@ vmxnet3_map_pkt(struct sk_buff *skb, struct vmxnet3_tx_ctx *ctx,
gdesc->dword[2] = cpu_to_le32(dw2); gdesc->dword[2] = cpu_to_le32(dw2);
gdesc->dword[3] = 0; gdesc->dword[3] = 0;
dev_dbg(&adapter->netdev->dev, netdev_dbg(adapter->netdev,
"txd[%u]: 0x%Lx 0x%x 0x%x\n", "txd[%u]: 0x%Lx 0x%x 0x%x\n",
tq->tx_ring.next2fill, le64_to_cpu(gdesc->txd.addr), tq->tx_ring.next2fill, le64_to_cpu(gdesc->txd.addr),
le32_to_cpu(gdesc->dword[2]), gdesc->dword[3]); le32_to_cpu(gdesc->dword[2]), gdesc->dword[3]);
...@@ -768,7 +768,7 @@ vmxnet3_map_pkt(struct sk_buff *skb, struct vmxnet3_tx_ctx *ctx, ...@@ -768,7 +768,7 @@ vmxnet3_map_pkt(struct sk_buff *skb, struct vmxnet3_tx_ctx *ctx,
gdesc->dword[2] = cpu_to_le32(dw2); gdesc->dword[2] = cpu_to_le32(dw2);
gdesc->dword[3] = 0; gdesc->dword[3] = 0;
dev_dbg(&adapter->netdev->dev, netdev_dbg(adapter->netdev,
"txd[%u]: 0x%llu %u %u\n", "txd[%u]: 0x%llu %u %u\n",
tq->tx_ring.next2fill, le64_to_cpu(gdesc->txd.addr), tq->tx_ring.next2fill, le64_to_cpu(gdesc->txd.addr),
le32_to_cpu(gdesc->dword[2]), gdesc->dword[3]); le32_to_cpu(gdesc->dword[2]), gdesc->dword[3]);
...@@ -868,7 +868,7 @@ vmxnet3_parse_and_copy_hdr(struct sk_buff *skb, struct vmxnet3_tx_queue *tq, ...@@ -868,7 +868,7 @@ vmxnet3_parse_and_copy_hdr(struct sk_buff *skb, struct vmxnet3_tx_queue *tq,
tdd = tq->data_ring.base + tq->tx_ring.next2fill; tdd = tq->data_ring.base + tq->tx_ring.next2fill;
memcpy(tdd->data, skb->data, ctx->copy_size); memcpy(tdd->data, skb->data, ctx->copy_size);
dev_dbg(&adapter->netdev->dev, netdev_dbg(adapter->netdev,
"copy %u bytes to dataRing[%u]\n", "copy %u bytes to dataRing[%u]\n",
ctx->copy_size, tq->tx_ring.next2fill); ctx->copy_size, tq->tx_ring.next2fill);
return 1; return 1;
...@@ -974,7 +974,7 @@ vmxnet3_tq_xmit(struct sk_buff *skb, struct vmxnet3_tx_queue *tq, ...@@ -974,7 +974,7 @@ vmxnet3_tq_xmit(struct sk_buff *skb, struct vmxnet3_tx_queue *tq,
if (count > vmxnet3_cmd_ring_desc_avail(&tq->tx_ring)) { if (count > vmxnet3_cmd_ring_desc_avail(&tq->tx_ring)) {
tq->stats.tx_ring_full++; tq->stats.tx_ring_full++;
dev_dbg(&adapter->netdev->dev, netdev_dbg(adapter->netdev,
"tx queue stopped on %s, next2comp %u" "tx queue stopped on %s, next2comp %u"
" next2fill %u\n", adapter->netdev->name, " next2fill %u\n", adapter->netdev->name,
tq->tx_ring.next2comp, tq->tx_ring.next2fill); tq->tx_ring.next2comp, tq->tx_ring.next2fill);
...@@ -1057,7 +1057,7 @@ vmxnet3_tq_xmit(struct sk_buff *skb, struct vmxnet3_tx_queue *tq, ...@@ -1057,7 +1057,7 @@ vmxnet3_tq_xmit(struct sk_buff *skb, struct vmxnet3_tx_queue *tq,
(struct Vmxnet3_TxDesc *)ctx.sop_txd); (struct Vmxnet3_TxDesc *)ctx.sop_txd);
gdesc = ctx.sop_txd; gdesc = ctx.sop_txd;
#endif #endif
dev_dbg(&adapter->netdev->dev, netdev_dbg(adapter->netdev,
"txd[%u]: SOP 0x%Lx 0x%x 0x%x\n", "txd[%u]: SOP 0x%Lx 0x%x 0x%x\n",
(u32)(ctx.sop_txd - (u32)(ctx.sop_txd -
tq->tx_ring.base), le64_to_cpu(gdesc->txd.addr), tq->tx_ring.base), le64_to_cpu(gdesc->txd.addr),
...@@ -1210,7 +1210,7 @@ vmxnet3_rq_rx_complete(struct vmxnet3_rx_queue *rq, ...@@ -1210,7 +1210,7 @@ vmxnet3_rq_rx_complete(struct vmxnet3_rx_queue *rq,
if (unlikely(rcd->len == 0)) { if (unlikely(rcd->len == 0)) {
/* Pretend the rx buffer is skipped. */ /* Pretend the rx buffer is skipped. */
BUG_ON(!(rcd->sop && rcd->eop)); BUG_ON(!(rcd->sop && rcd->eop));
dev_dbg(&adapter->netdev->dev, netdev_dbg(adapter->netdev,
"rxRing[%u][%u] 0 length\n", "rxRing[%u][%u] 0 length\n",
ring_idx, idx); ring_idx, idx);
goto rcd_done; goto rcd_done;
...@@ -2211,7 +2211,7 @@ vmxnet3_activate_dev(struct vmxnet3_adapter *adapter) ...@@ -2211,7 +2211,7 @@ vmxnet3_activate_dev(struct vmxnet3_adapter *adapter)
u32 ret; u32 ret;
unsigned long flags; unsigned long flags;
dev_dbg(&adapter->netdev->dev, "%s: skb_buf_size %d, rx_buf_per_pkt %d," netdev_dbg(adapter->netdev, "%s: skb_buf_size %d, rx_buf_per_pkt %d,"
" ring sizes %u %u %u\n", adapter->netdev->name, " ring sizes %u %u %u\n", adapter->netdev->name,
adapter->skb_buf_size, adapter->rx_buf_per_pkt, adapter->skb_buf_size, adapter->rx_buf_per_pkt,
adapter->tx_queue[0].tx_ring.size, adapter->tx_queue[0].tx_ring.size,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment