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

Commit f6815077 authored by stephen hemminger's avatar stephen hemminger Committed by David S. Miller
Browse files

sky2: fix transmit DMA map leakage 



The book keeping structure for transmit always had the flags value
cleared so transmit DMA maps were never released correctly.
Based on patch by Jarek Poplawski, problem observed by Michael Breuer.

Signed-off-by: default avatarStephen Hemminger <shemminger@vyatta.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 974c37e9

drivers/net/sky2.c

+3 −5
Original line number Diff line number Diff line
@@ -1025,11 +1025,8 @@ static void sky2_prefetch_init(struct sky2_hw *hw, u32 qaddr, 
static inline struct sky2_tx_le *get_tx_le(struct sky2_port *sky2, u16 *slot)

{

	struct sky2_tx_le *le = sky2->tx_le + *slot;

	struct tx_ring_info *re = sky2->tx_ring + *slot;



	*slot = RING_NEXT(*slot, sky2->tx_ring_size);

	re->flags = 0;

	re->skb = NULL;

	le->ctrl = 0;

	return le;

}
@@ -1622,8 +1619,7 @@ static unsigned tx_le_req(const struct sk_buff *skb) 
	return count;

}



static void sky2_tx_unmap(struct pci_dev *pdev,

			  const struct tx_ring_info *re)

static void sky2_tx_unmap(struct pci_dev *pdev, struct tx_ring_info *re)

{

	if (re->flags & TX_MAP_SINGLE)

		pci_unmap_single(pdev, pci_unmap_addr(re, mapaddr),
@@ -1633,6 +1629,7 @@ static void sky2_tx_unmap(struct pci_dev *pdev, 
		pci_unmap_page(pdev, pci_unmap_addr(re, mapaddr),

			       pci_unmap_len(re, maplen),

			       PCI_DMA_TODEVICE);

	re->flags = 0;

}



/*
@@ -1839,6 +1836,7 @@ static void sky2_tx_complete(struct sky2_port *sky2, u16 done) 
			dev->stats.tx_packets++;

			dev->stats.tx_bytes += skb->len;



			re->skb = NULL;

			dev_kfree_skb_any(skb);



			sky2->tx_next = RING_NEXT(idx, sky2->tx_ring_size);