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

Commit e382c301 authored by kirjanov@gmail.com's avatar kirjanov@gmail.com Committed by David S. Miller
Browse files

sis190: handle DMA mapping errors 



Signed-off-by: default avatarDenis Kirjanov <kirjanov@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent dee7399c

drivers/net/sis190.c

+19 −8
Original line number Diff line number Diff line
@@ -484,18 +484,24 @@ static struct sk_buff *sis190_alloc_rx_skb(struct sis190_private *tp, 
{

	u32 rx_buf_sz = tp->rx_buf_sz;

	struct sk_buff *skb;



	skb = netdev_alloc_skb(tp->dev, rx_buf_sz);

	if (likely(skb)) {

	dma_addr_t mapping;



	skb = netdev_alloc_skb(tp->dev, rx_buf_sz);

	if (unlikely(!skb))

		goto skb_alloc_failed;

	mapping = pci_map_single(tp->pci_dev, skb->data, tp->rx_buf_sz,

			PCI_DMA_FROMDEVICE);

	if (pci_dma_mapping_error(tp->pci_dev, mapping))

		goto out;

	sis190_map_to_asic(desc, mapping, rx_buf_sz);

	} else

		sis190_make_unusable_by_asic(desc);



	return skb;



out:

	dev_kfree_skb_any(skb);

skb_alloc_failed:

	sis190_make_unusable_by_asic(desc);

	return NULL;

}



static u32 sis190_rx_fill(struct sis190_private *tp, struct net_device *dev,
@@ -1184,6 +1190,11 @@ static netdev_tx_t sis190_start_xmit(struct sk_buff *skb, 
	}



	mapping = pci_map_single(tp->pci_dev, skb->data, len, PCI_DMA_TODEVICE);

	if (pci_dma_mapping_error(tp->pci_dev, mapping)) {

		netif_err(tp, tx_err, dev,

				"PCI mapping failed, dropping packet");

		return NETDEV_TX_BUSY;

	}



	tp->Tx_skbuff[entry] = skb;