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

Commit 839d1624 authored by Francois Romieu's avatar Francois Romieu Committed by David S. Miller
Browse files

8139cp: balance dma_map_single vs dma_unmap_single pair 



The driver always:
1. allocate cp->rx_buf_sz + NET_IP_ALIGN
2. map cp->rx_buf_sz

Signed-off-by: default avatarFrancois Romieu <romieu@fr.zoreil.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 9799218a

drivers/net/8139cp.c

+2 −3
Original line number Diff line number Diff line
@@ -515,7 +515,7 @@ static int cp_rx_poll(struct napi_struct *napi, int budget) 
		dma_addr_t mapping;

		struct sk_buff *skb, *new_skb;

		struct cp_desc *desc;

		unsigned buflen;

		const unsigned buflen = cp->rx_buf_sz;



		skb = cp->rx_skb[rx_tail];

		BUG_ON(!skb);
@@ -549,8 +549,7 @@ static int cp_rx_poll(struct napi_struct *napi, int budget) 
			pr_debug("%s: rx slot %d status 0x%x len %d\n",

			       dev->name, rx_tail, status, len);



		buflen = cp->rx_buf_sz + NET_IP_ALIGN;

		new_skb = netdev_alloc_skb(dev, buflen);

		new_skb = netdev_alloc_skb(dev, buflen + NET_IP_ALIGN);

		if (!new_skb) {

			dev->stats.rx_dropped++;

			goto rx_next;