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

Commit fd8ae94e authored by Jeff Garzik's avatar Jeff Garzik
Browse files

Merge branch 'upstream-fixes' into upstream

parents 783c99f4 54caf44d

drivers/net/lp486e.c

+3 −3
Original line number Diff line number Diff line
@@ -442,16 +442,16 @@ init_rx_bufs(struct net_device *dev, int num) { 
		if (rbd) {

			rbd->pad = 0;

			rbd->count = 0;

			rbd->skb = dev_alloc_skb(RX_SKB_SIZE);

			rbd->skb = dev_alloc_skb(RX_SKBSIZE);

			if (!rbd->skb) {

				printk("dev_alloc_skb failed");

			}

			rbd->next = rfd->rbd;

			if (i) {

				rfd->rbd->prev = rbd;

				rbd->size = RX_SKB_SIZE;

				rbd->size = RX_SKBSIZE;

			} else {

				rbd->size = (RX_SKB_SIZE | RBD_EL);

				rbd->size = (RX_SKBSIZE | RBD_EL);

				lp->rbd_tail = rbd;

			}

drivers/net/mv643xx_eth.c

+1 −1
Original line number Diff line number Diff line
@@ -385,7 +385,7 @@ 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_unmap_single(NULL, pkt_info.buf_ptr, ETH_RX_SKB_SIZE,

							DMA_FROM_DEVICE);

		mp->rx_desc_count--;

		received_packets++;