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

Commit 38ed61d6 authored by Jeff Garzik's avatar Jeff Garzik
Browse files

Merge branch 'upstream-fixes' into upstream

parents 42911305 71d28725

drivers/net/mv643xx_eth.c

+2 −0
Original line number Diff line number Diff line
@@ -385,6 +385,8 @@ static int mv643xx_eth_receive_queue(struct net_device *dev, int budget) 
	struct pkt_info pkt_info;



	while (budget-- > 0 && eth_port_receive(mp, &pkt_info) == ETH_OK) {

		dma_unmap_single(NULL, pkt_info.buf_ptr, RX_SKB_SIZE,

							DMA_FROM_DEVICE);

		mp->rx_desc_count--;

		received_packets++;