Skip to content

Commit

Permalink
8139cp: Fix tx_queued debug message to print correct slot numbers
Browse files Browse the repository at this point in the history
After a certain amount of staring at the debug output of this driver, I
realised it was lying to me.

Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
  • Loading branch information
David Woodhouse authored and David S. Miller committed Sep 23, 2015
1 parent aaa0062 commit 26b0bad
Showing 1 changed file with 8 additions and 7 deletions.
15 changes: 8 additions & 7 deletions drivers/net/ethernet/realtek/8139cp.c
Original file line number Diff line number Diff line change
Expand Up @@ -786,7 +786,8 @@ static netdev_tx_t cp_start_xmit (struct sk_buff *skb,
wmb();

cp->tx_skb[entry] = skb;
entry = NEXT_TX(entry);
netif_dbg(cp, tx_queued, cp->dev, "tx queued, slot %d, skblen %d\n",
entry, skb->len);
} else {
struct cp_desc *txd;
u32 first_len, first_eor;
Expand All @@ -805,14 +806,15 @@ static netdev_tx_t cp_start_xmit (struct sk_buff *skb,
goto out_dma_error;

cp->tx_skb[entry] = skb;
entry = NEXT_TX(entry);

for (frag = 0; frag < skb_shinfo(skb)->nr_frags; frag++) {
const skb_frag_t *this_frag = &skb_shinfo(skb)->frags[frag];
u32 len;
u32 ctrl;
dma_addr_t mapping;

entry = NEXT_TX(entry);

len = skb_frag_size(this_frag);
mapping = dma_map_single(&cp->pdev->dev,
skb_frag_address(this_frag),
Expand Down Expand Up @@ -848,9 +850,7 @@ static netdev_tx_t cp_start_xmit (struct sk_buff *skb,

txd->opts1 = cpu_to_le32(ctrl);
wmb();

cp->tx_skb[entry] = skb;
entry = NEXT_TX(entry);
}

txd = &cp->tx_ring[first_entry];
Expand All @@ -873,12 +873,13 @@ static netdev_tx_t cp_start_xmit (struct sk_buff *skb,
txd->opts1 = cpu_to_le32(first_eor | first_len |
FirstFrag | DescOwn);
wmb();

netif_dbg(cp, tx_queued, cp->dev, "tx queued, slots %d-%d, skblen %d\n",
first_entry, entry, skb->len);
}
cp->tx_head = entry;
cp->tx_head = NEXT_TX(entry);

netdev_sent_queue(dev, skb->len);
netif_dbg(cp, tx_queued, cp->dev, "tx queued, slot %d, skblen %d\n",
entry, skb->len);
if (TX_BUFFS_AVAIL(cp) <= (MAX_SKB_FRAGS + 1))
netif_stop_queue(dev);

Expand Down

0 comments on commit 26b0bad

Please sign in to comment.