Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 26b0bad6 authored by David Woodhouse's avatar David Woodhouse Committed by David S. Miller
Browse files

8139cp: Fix tx_queued debug message to print correct slot numbers 



After a certain amount of staring at the debug output of this driver, I
realised it was lying to me.

Signed-off-by: default avatarDavid Woodhouse <David.Woodhouse@intel.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent aaa0062e

drivers/net/ethernet/realtek/8139cp.c

+8 −7
Original line number Original line Diff line number Diff line
@@ -786,7 +786,8 @@ static netdev_tx_t cp_start_xmit (struct sk_buff *skb, 
		wmb();

		wmb();





		cp->tx_skb[entry] = skb;

		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 {

	} else {

		struct cp_desc *txd;

		struct cp_desc *txd;

		u32 first_len, first_eor;

		u32 first_len, first_eor;
@@ -805,7 +806,6 @@ static netdev_tx_t cp_start_xmit (struct sk_buff *skb, 
			goto out_dma_error;

			goto out_dma_error;





		cp->tx_skb[entry] = skb;

		cp->tx_skb[entry] = skb;

		entry = NEXT_TX(entry);





		for (frag = 0; frag < skb_shinfo(skb)->nr_frags; frag++) {

		for (frag = 0; frag < skb_shinfo(skb)->nr_frags; frag++) {

			const skb_frag_t *this_frag = &skb_shinfo(skb)->frags[frag];

			const skb_frag_t *this_frag = &skb_shinfo(skb)->frags[frag];
@@ -813,6 +813,8 @@ static netdev_tx_t cp_start_xmit (struct sk_buff *skb, 
			u32 ctrl;

			u32 ctrl;

			dma_addr_t mapping;

			dma_addr_t mapping;





			entry = NEXT_TX(entry);



			len = skb_frag_size(this_frag);

			len = skb_frag_size(this_frag);

			mapping = dma_map_single(&cp->pdev->dev,

			mapping = dma_map_single(&cp->pdev->dev,

						 skb_frag_address(this_frag),

						 skb_frag_address(this_frag),
@@ -848,9 +850,7 @@ static netdev_tx_t cp_start_xmit (struct sk_buff *skb, 




			txd->opts1 = cpu_to_le32(ctrl);

			txd->opts1 = cpu_to_le32(ctrl);

			wmb();

			wmb();



			cp->tx_skb[entry] = skb;

			cp->tx_skb[entry] = skb;

			entry = NEXT_TX(entry);

		}

		}





		txd = &cp->tx_ring[first_entry];

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

			txd->opts1 = cpu_to_le32(first_eor | first_len |

						 FirstFrag | DescOwn);

						 FirstFrag | DescOwn);

		wmb();

		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);

	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))

	if (TX_BUFFS_AVAIL(cp) <= (MAX_SKB_FRAGS + 1))

		netif_stop_queue(dev);

		netif_stop_queue(dev);